diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 1e65ebf1aa..569cbd6b0b 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -38,6 +38,8 @@ class ExpandedForm
         $options['min']  = '0.01';
         $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
         $currencies      = Amt::getAllCurrencies();
+        unset($options['currency']);
+        unset($options['placeholder']);
         $html            = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
@@ -140,6 +142,8 @@ class ExpandedForm
         $options['step'] = 'any';
         $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
         $currencies      = Amt::getAllCurrencies();
+        unset($options['currency']);
+        unset($options['placeholder']);
         $html            = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
@@ -181,6 +185,7 @@ class ExpandedForm
         $options = $this->expandOptionArray($name, $label, $options);
         $classes = $this->getHolderClasses($name);
         $value   = $this->fillFieldValue($name, $value);
+        unset($options['placeholder']);
         $html    = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
@@ -316,6 +321,8 @@ class ExpandedForm
         $options  = $this->expandOptionArray($name, $label, $options);
         $classes  = $this->getHolderClasses($name);
         $selected = $this->fillFieldValue($name, $selected);
+        unset($options['autocomplete']);
+        unset($options['placeholder']);
         $html     = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
 
         return $html;
diff --git a/resources/twig/accounts/show.twig b/resources/twig/accounts/show.twig
index 1236ba546e..621c78171b 100644
--- a/resources/twig/accounts/show.twig
+++ b/resources/twig/accounts/show.twig
@@ -5,57 +5,58 @@
 {% endblock %}
 
 {% block content %}
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ account.name }}</h3>
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ account.name }}</h3>
 
-                <!-- ACTIONS MENU -->
-                <div class="box-tools pull-right">
-                    <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                    <div class="btn-group">
-                        <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{{ route('accounts.edit', account.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
-                            <li><a href="{{ route('accounts.delete', account.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
-                        </ul>
+                    <!-- ACTIONS MENU -->
+                    <div class="box-tools pull-right">
+                        <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                        <div class="btn-group">
+                            <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
+                            <ul class="dropdown-menu" role="menu">
+                                <li><a href="{{ route('accounts.edit', account.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
+                                <li><a href="{{ route('accounts.delete', account.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
+                            </ul>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="box-body">
-                <div id="overview-chart"></div>
+                <div class="box-body">
+                    <div id="overview-chart"></div>
+                </div>
             </div>
         </div>
     </div>
-</div>
 
 
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{ 'transactions'|_ }}</h3>
-            </div>
-            <div class="box-body table-responsive no-padding">
-                {% include 'list/journals.twig' with {sorting:true} %}
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding">
+                    {% include 'list/journals.twig' with {sorting:true} %}
+                </div>
             </div>
         </div>
     </div>
 
 
 
-    {% endblock %}
+{% endblock %}
 
-    {% block scripts %}
-        <script type="text/javascript">
-            var accountID = {{ account.id }};
-        </script>
-        <!-- load the libraries and scripts necessary for Google Charts: -->
-        <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-        <script type="text/javascript" src="js/gcharts.options.js"></script>
-        <script type="text/javascript" src="js/gcharts.js"></script>
-        <script src="js/jquery-ui.min.js" type="text/javascript"></script>
-        <script src="js/accounts.js" type="text/javascript"></script>
+{% block scripts %}
+    <script type="text/javascript">
+        var accountID = {{ account.id }};
+    </script>
+    <!-- load the libraries and scripts necessary for Google Charts: -->
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+    <script type="text/javascript" src="js/gcharts.options.js"></script>
+    <script type="text/javascript" src="js/gcharts.js"></script>
+    <script src="js/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="js/accounts.js" type="text/javascript"></script>
 
-    {% endblock %}
+{% endblock %}
diff --git a/resources/twig/bills/create.twig b/resources/twig/bills/create.twig
index ba013a9289..b9c8ba62dd 100644
--- a/resources/twig/bills/create.twig
+++ b/resources/twig/bills/create.twig
@@ -55,13 +55,6 @@
         </div>
 
     </div>
-    <div class="row">
-        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-            <p>
-
-            </p>
-        </div>
-    </div>
 
     {{ Form.close|raw }}
 
diff --git a/resources/twig/form/amount.twig b/resources/twig/form/amount.twig
index 765b200feb..21cffad8c8 100644
--- a/resources/twig/form/amount.twig
+++ b/resources/twig/form/amount.twig
@@ -4,7 +4,7 @@
         <div class="input-group">
             <div class="input-group-btn">
                 <button type="button" class="btn btn-default dropdown-toggle amountCurrencyDropdown" data-toggle="dropdown" aria-expanded="false">
-                    <span id="amountCurrentSymbol">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
+                    <span>{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" role="menu">
                     {% for currency in currencies %}
diff --git a/resources/twig/form/balance.twig b/resources/twig/form/balance.twig
index e8e8e05ae0..f53f12428b 100644
--- a/resources/twig/form/balance.twig
+++ b/resources/twig/form/balance.twig
@@ -4,7 +4,7 @@
         <div class="input-group">
             <div class="input-group-btn">
                 <button type="button" class="btn btn-default dropdown-toggle balanceCurrencyDropdown" data-toggle="dropdown" aria-expanded="false">
-                    <span id="balanceCurrentSymbol">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
+                    <span>{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu" role="menu">
                     {% for currency in currencies %}
diff --git a/resources/twig/form/options.twig b/resources/twig/form/options.twig
index c51fbc81e0..5f488ac35a 100644
--- a/resources/twig/form/options.twig
+++ b/resources/twig/form/options.twig
@@ -6,7 +6,7 @@
         <div class="col-sm-8">
             <div class="radio">
                 <label>
-                    {{ Form.checkbox('create_another', '1') }}
+                    {{ Form.checkbox('create_another', '1', false, {'id': name ~ '_return_to_form'}) }}
                     {{ trans('form.returnHereExplanation') }}
 
                 </label>
@@ -22,7 +22,7 @@
         </label>
         <div class="col-sm-8">
             <div class="radio"><label>
-                    {{ Form.checkbox('return_to_edit', '1', Input.old('return_to_edit') == '1') }}
+                    {{ Form.checkbox(name ~ '_return_to_edit', '1', Input.old('return_to_edit') == '1', {'id': name ~ '_return_to_edit'}) }}
                     {{ trans('form.returnHereUpdateExplanation') }}
                 </label>
             </div>
diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index 2b9c8ca942..65e0dfcd2b 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -131,7 +131,7 @@
 
 
 <!-- Modal -->
-<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel">
+<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
 </div>
 
 
diff --git a/resources/twig/layout/guest.twig b/resources/twig/layout/guest.twig
index b6fb5346fc..e90b550dcd 100644
--- a/resources/twig/layout/guest.twig
+++ b/resources/twig/layout/guest.twig
@@ -44,7 +44,6 @@
     {% block content %}{% endblock %}
 </div>
 <!-- /.login-box -->
-</body>
 <script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
 <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>