diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 35eb8855b9..750a0edd84 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -51,29 +51,7 @@ class ExpandedForm
         if (isset($options['label'])) {
             return $options['label'];
         }
-        $labels = [
-            'amount_min'           => 'Amount (min)',
-            'amount_max'           => 'Amount (max)',
-            'match'                => 'Matches on',
-            'repeat_freq'          => 'Repetition',
-            'account_from_id'      => 'Account from',
-            'account_to_id'        => 'Account to',
-            'account_id'           => 'Asset account',
-            'budget_id'            => 'Budget',
-            'openingBalance'       => 'Opening balance',
-            'tagMode'              => 'Tag mode',
-            'tagPosition'          => 'Tag location',
-            'virtualBalance'       => 'Virtual balance',
-            'longitude_latitude'   => 'Location',
-            'targetamount'         => 'Target amount',
-            'accountRole'          => 'Account role',
-            'openingBalanceDate'   => 'Opening balance date',
-            'ccType'               => 'Credit card payment plan',
-            'ccMonthlyPaymentDate' => 'Credit card monthly payment date',
-            'piggy_bank_id'        => 'Piggy bank'];
-
-
-        return isset($labels[$name]) ? $labels[$name] : str_replace('_', ' ', ucfirst($name));
+        return trans('form.'.$name);
 
     }
 
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index 1b2c0b4b5d..b2b051e69b 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -1,12 +1,14 @@
 <?php
+
+// general fields and things.
 return [
     'test'            => 'You have selected English.',
-    'welcome'         => 'Welcome to Firefly!',
     'close'           => 'Close',
     'pleaseHold'      => 'Please hold...',
     'mandatoryFields' => 'Mandatory fields',
     'optionalFields'  => 'Optional fields',
     'options'         => 'Options',
-    'something'       => 'Something!'
+    'something'       => 'Something!',
+    'actions'         => 'Actions'
 
 ];
diff --git a/resources/lang/en/form.php b/resources/lang/en/form.php
new file mode 100644
index 0000000000..fa97c45a2f
--- /dev/null
+++ b/resources/lang/en/form.php
@@ -0,0 +1,28 @@
+<?php
+return [
+    'name'                        => 'Name',
+    'active'                      => 'Active',
+    'amount_min'                  => 'Minimum amount',
+    'amount_max'                  => 'Maximum amount',
+    'match'                       => 'Matches on',
+    'repeat_freq'                 => 'Repeats',
+    'account_from_id'             => 'From account',
+    'account_to_id'               => 'To account',
+    'account_id'                  => 'Asset account',
+    'budget_id'                   => 'Budget',
+    'openingBalance'              => 'Opening balance',
+    'tagMode'                     => 'Tag mode',
+    'tagPosition'                 => 'Tag location',
+    'virtualBalance'              => 'Vitual balance',
+    'longitude_latitude'          => 'Location',
+    'targetamount'                => 'Target amount',
+    'accountRole'                 => 'Account role',
+    'openingBalanceDate'          => 'Opening balance date',
+    'ccType'                      => 'Credit card payment plan',
+    'ccMonthlyPaymentDate'        => 'Credit card monthly payment date',
+    'piggy_bank_id'               => 'Piggy bank',
+    'returnHere'                  => 'Return here',
+    'returnHereExplanation'       => 'After storing, return here to create another one.',
+    'returnHereUpdateExplanation' => 'After updating, return here.',
+
+];
\ No newline at end of file
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index a6331a34e5..d3a9ca0d99 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -1,5 +1,14 @@
 <?php
+
+// general fields and things.
 return [
     'test'            => 'Nederlands geselecteerd!',
+    'close'           => 'Sluiten',
+    'pleaseHold'      => 'Momentje...',
+    'mandatoryFields' => 'Verplichte velden',
+    'optionalFields'  => 'Optionele velden',
+    'options'         => 'Opties',
+    'something'       => 'Iets!',
+    'actions'         => 'Acties'
 
 ];
diff --git a/resources/lang/nl/form.php b/resources/lang/nl/form.php
new file mode 100644
index 0000000000..4262dc5aea
--- /dev/null
+++ b/resources/lang/nl/form.php
@@ -0,0 +1,28 @@
+<?php
+return [
+    'name'                        => 'Naam',
+    'active'                      => 'Actief',
+    'amount_min'                  => 'Minimumbedrag',
+    'amount_max'                  => 'Maximumbedrag',
+    'match'                       => 'Reageert op',
+    'repeat_freq'                 => 'Herhaling',
+    'account_from_id'             => 'Van account',
+    'account_to_id'               => 'Naar account',
+    'account_id'                  => 'Betaalrekening',
+    'budget_id'                   => 'Budget',
+    'openingBalance'              => 'Startbalans',
+    'tagMode'                     => 'Tag modus',
+    'tagPosition'                 => 'Tag locatie',
+    'virtualBalance'              => 'Virtuele balans',
+    'longitude_latitude'          => 'Locatie',
+    'targetamount'                => 'Doelbedrag',
+    'accountRole'                 => 'Rol van rekening',
+    'openingBalanceDate'          => 'Startbalansdatum',
+    'ccType'                      => 'Betaalplan',
+    'ccMonthlyPaymentDate'        => 'Betaaldatum',
+    'piggy_bank_id'               => 'Spaarpotje',
+    'returnHere'                  => 'Keer terug',
+    'returnHereExplanation'       => 'Terug naar deze pagina na het opslaan.',
+    'returnHereUpdateExplanation' => 'Terug naar deze pagina na het wijzigen.',
+
+];
\ No newline at end of file
diff --git a/resources/twig/accounts/index.twig b/resources/twig/accounts/index.twig
index a596dd3111..0f914ba141 100644
--- a/resources/twig/accounts/index.twig
+++ b/resources/twig/accounts/index.twig
@@ -11,7 +11,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/accounts/show.twig b/resources/twig/accounts/show.twig
index 6822a6833c..5b751239db 100644
--- a/resources/twig/accounts/show.twig
+++ b/resources/twig/accounts/show.twig
@@ -12,7 +12,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/auth/login.twig b/resources/twig/auth/login.twig
index b8a75141db..9273e51566 100644
--- a/resources/twig/auth/login.twig
+++ b/resources/twig/auth/login.twig
@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col-lg-12">
         <div class="alert alert-danger alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
             <strong>Error!</strong> {{  errors.get('email')[0] }}
         </div>
     </div>
diff --git a/resources/twig/bills/index.twig b/resources/twig/bills/index.twig
index e2b6531245..a601d65298 100644
--- a/resources/twig/bills/index.twig
+++ b/resources/twig/bills/index.twig
@@ -11,7 +11,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/bills/show.twig b/resources/twig/bills/show.twig
index 5c3ed858f9..e924a8b5a2 100644
--- a/resources/twig/bills/show.twig
+++ b/resources/twig/bills/show.twig
@@ -22,7 +22,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/budgets/income.twig b/resources/twig/budgets/income.twig
index de8420042b..d642a54c54 100644
--- a/resources/twig/budgets/income.twig
+++ b/resources/twig/budgets/income.twig
@@ -4,7 +4,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
                 <h4 class="modal-title" id="myModalLabel">Update (expected) available amount for {{Session.get('start').format('F Y')}}</h4>
             </div>
             <div class="modal-body">
@@ -14,7 +14,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
                 <button type="submit" class="btn btn-primary">Update</button>
             </div>
         </div>
diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig
index 11059b48ac..e84d19c24b 100644
--- a/resources/twig/budgets/index.twig
+++ b/resources/twig/budgets/index.twig
@@ -90,7 +90,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/budgets/show.twig b/resources/twig/budgets/show.twig
index b2041c745a..7b1706f626 100644
--- a/resources/twig/budgets/show.twig
+++ b/resources/twig/budgets/show.twig
@@ -12,7 +12,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/categories/index.twig b/resources/twig/categories/index.twig
index ae3c267a26..f79e9ad08d 100644
--- a/resources/twig/categories/index.twig
+++ b/resources/twig/categories/index.twig
@@ -11,7 +11,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/form/options.twig b/resources/twig/form/options.twig
index 5ba3fcb96d..c51fbc81e0 100644
--- a/resources/twig/form/options.twig
+++ b/resources/twig/form/options.twig
@@ -1,13 +1,14 @@
 {% if type == 'create' %}
     <div class="form-group">
         <label for="{{ name }}_return_to_form" class="col-sm-4 control-label">
-            Return here
+            {{ trans('form.returnHere') }}
         </label>
         <div class="col-sm-8">
             <div class="radio">
                 <label>
                     {{ Form.checkbox('create_another', '1') }}
-                    After storing, return here to create another one.
+                    {{ trans('form.returnHereExplanation') }}
+
                 </label>
             </div>
         </div>
@@ -17,12 +18,12 @@
 {% if type == 'update' %}
     <div class="form-group">
         <label for="{{ name }}_return_to_edit" class="col-sm-4 control-label">
-            Return here
+            {{ trans('form.returnHere') }}
         </label>
         <div class="col-sm-8">
             <div class="radio"><label>
                     {{ Form.checkbox('return_to_edit', '1', Input.old('return_to_edit') == '1') }}
-                    After updating, return here.
+                    {{ trans('form.returnHereUpdateExplanation') }}
                 </label>
             </div>
         </div>
diff --git a/resources/twig/index.twig b/resources/twig/index.twig
index 570a33ba71..fbaa0b89f8 100644
--- a/resources/twig/index.twig
+++ b/resources/twig/index.twig
@@ -176,7 +176,7 @@
                 <div class="pull-right">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                            Actions
+                            {{ 'actions'|_ }}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/partials/flashes.twig b/resources/twig/partials/flashes.twig
index de601e38c7..4be297a0e9 100644
--- a/resources/twig/partials/flashes.twig
+++ b/resources/twig/partials/flashes.twig
@@ -1,27 +1,27 @@
 {% if Session.has('success') %}
 <div class="alert alert-success alert-dismissible" role="alert">
-    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
     <strong>Success!</strong> {{Session.get('success')}}
 </div>
 {% endif %}
 
 {% if Session.has('info') %}
 <div class="alert alert-info alert-dismissible" role="alert">
-    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
     <strong>Info:</strong> {{Session.get('info')}}
 </div>
 {% endif %}
 
 {% if Session.has('warning') %}
 <div class="alert alert-warning alert-dismissible" role="alert">
-    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
     <strong>Warning!</strong> {{Session.get('warning')}}
 </div>
 {% endif %}
 
 {% if Session.has('error') %}
 <div class="alert alert-danger alert-dismissible" role="alert">
-    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
     <strong>Error!</strong> {{Session.get('error')}}
 </div>
 {% endif %}
diff --git a/resources/twig/piggy-banks/add.twig b/resources/twig/piggy-banks/add.twig
index 85535a4297..ec7fad074a 100644
--- a/resources/twig/piggy-banks/add.twig
+++ b/resources/twig/piggy-banks/add.twig
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
                 <h4 class="modal-title" id="myModalLabel">Add money to {{ piggyBank.name }}</h4>
             </div>
             <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
@@ -18,7 +18,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
                 <button type="submit" class="btn btn-primary">Add</button>
             </div>
             </form>
diff --git a/resources/twig/piggy-banks/remove.twig b/resources/twig/piggy-banks/remove.twig
index 529dd6c66e..ff52fc91ab 100644
--- a/resources/twig/piggy-banks/remove.twig
+++ b/resources/twig/piggy-banks/remove.twig
@@ -3,7 +3,7 @@
             <form style="display: inline;" id="remove" action="{{ route('piggy-banks.remove', piggyBank.id) }}" method="POST">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}" />
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
                 <h4 class="modal-title" id="myModalLabel">Remove money from {{ piggyBank.name }}</h4>
             </div>
 
@@ -17,7 +17,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
                 <button type="submit" class="btn btn-primary">Remove</button>
             </div>
         </form>
diff --git a/resources/twig/piggy-banks/show.twig b/resources/twig/piggy-banks/show.twig
index 9c27bdc27c..97bdc223d6 100644
--- a/resources/twig/piggy-banks/show.twig
+++ b/resources/twig/piggy-banks/show.twig
@@ -21,7 +21,7 @@
                     <div class="pull-right">
                         <div class="btn-group">
                             <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                Actions
+                                {{ 'actions'|_ }}
                                 <span class="caret"></span>
                             </button>
                             <ul class="dropdown-menu pull-right" role="menu">
diff --git a/resources/twig/reports/modal-journal-list.twig b/resources/twig/reports/modal-journal-list.twig
index 21cad324eb..2d2d14b796 100644
--- a/resources/twig/reports/modal-journal-list.twig
+++ b/resources/twig/reports/modal-journal-list.twig
@@ -1,14 +1,14 @@
 <div class="modal-dialog modal-lg">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
             <h4 class="modal-title">No budget bla bla.</h4>
         </div>
         <div class="modal-body">
             {% include 'list/journals.twig' %}
         </div>
         <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
         </div>
     </div>
 </div>
diff --git a/resources/twig/tags/show.twig b/resources/twig/tags/show.twig
index ae61d5b587..73dcfe97a6 100644
--- a/resources/twig/tags/show.twig
+++ b/resources/twig/tags/show.twig
@@ -15,7 +15,7 @@
                         <div class="pull-right">
                             <div class="btn-group">
                                 <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                    Actions
+                                    {{ 'actions'|_ }}
                                     <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu pull-right" role="menu">
@@ -53,7 +53,7 @@
                     <div class="pull-right">
                         <div class="btn-group">
                             <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                Actions
+                                {{ 'actions'|_ }}
                                 <span class="caret"></span>
                             </button>
                             <ul class="dropdown-menu pull-right" role="menu">