diff --git a/public/js/accounts/show.js b/public/js/ff/accounts/show.js
similarity index 100%
rename from public/js/accounts/show.js
rename to public/js/ff/accounts/show.js
diff --git a/public/js/bills.js b/public/js/ff/bills/show.js
similarity index 100%
rename from public/js/bills.js
rename to public/js/ff/bills/show.js
diff --git a/public/js/budgets.js b/public/js/ff/budgets/index.js
similarity index 100%
rename from public/js/budgets.js
rename to public/js/ff/budgets/index.js
diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js
new file mode 100644
index 0000000000..c8ca145734
--- /dev/null
+++ b/public/js/ff/budgets/show.js
@@ -0,0 +1,117 @@
+/* globals $, budgeted:true, currencySymbol, budgetIncomeTotal, columnChart,  budgetedMuch, budgetedPercentage, token, budgetID, repetitionID, spent, lineChart */
+
+function drawSpentBar() {
+    "use strict";
+    if ($('.spentBar').length > 0) {
+        var overspent = spent > budgeted;
+        var pct;
+
+        if (overspent) {
+            // draw overspent bar
+            pct = (budgeted / spent) * 100;
+            $('.spentBar .progress-bar-warning').css('width', pct + '%');
+            $('.spentBar .progress-bar-danger').css('width', (100 - pct) + '%');
+        } else {
+            // draw normal bar:
+            pct = (spent / budgeted) * 100;
+            $('.spentBar .progress-bar-info').css('width', pct + '%');
+        }
+    }
+}
+
+function drawBudgetedBar() {
+    "use strict";
+
+    if ($('.budgetedBar').length > 0) {
+        var budgetedMuch = budgeted > budgetIncomeTotal;
+
+        // recalculate percentage:
+
+        var pct;
+        if (budgetedMuch) {
+            // budgeted too much.
+            pct = (budgetIncomeTotal / budgeted) * 100;
+            $('.budgetedBar .progress-bar-warning').css('width', pct + '%');
+            $('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%');
+            $('.budgetedBar .progress-bar-info').css('width', 0);
+        } else {
+            pct = (budgeted / budgetIncomeTotal) * 100;
+            $('.budgetedBar .progress-bar-warning').css('width', 0);
+            $('.budgetedBar .progress-bar-danger').css('width', 0);
+            $('.budgetedBar .progress-bar-info').css('width', pct + '%');
+        }
+
+        $('#budgetedAmount').html(currencySymbol + ' ' + budgeted.toFixed(2));
+    }
+}
+
+function updateBudgetedAmounts(e) {
+    "use strict";
+    var target = $(e.target);
+    var id = target.data('id');
+    var value = target.val();
+    var original = target.data('original');
+    var difference = value - original;
+    if (difference !== 0) {
+        // add difference to 'budgeted' var
+        budgeted = budgeted + difference;
+
+        // update original:
+        target.data('original', value);
+        // run drawBudgetedBar() again:
+        drawBudgetedBar();
+
+        // send a post to Firefly to update the amount:
+        $.post('budgets/amount/' + id, {amount: value, _token: token}).done(function (data) {
+            // update the link if relevant:
+            if (data.repetition > 0) {
+                $('.budget-link[data-id="' + id + '"]').attr('href', 'budgets/show/' + id + '/' + data.repetition);
+            } else {
+                $('.budget-link[data-id="' + id + '"]').attr('href', 'budgets/show/' + id);
+            }
+        });
+    }
+
+
+    console.log('Budget id is ' + id);
+    console.log('Difference = ' + (value - original ));
+
+}
+
+$(function () {
+    "use strict";
+
+    $('.updateIncome').on('click', updateIncome);
+
+    /*
+     On start, fill the "spent"-bar using the content from the page.
+     */
+    drawSpentBar();
+    drawBudgetedBar();
+
+    /*
+     When the input changes, update the percentages for the budgeted bar:
+     */
+    $('input[type="number"]').on('input', updateBudgetedAmounts);
+
+
+    /*
+     Draw the charts, if necessary:
+     */
+    if (typeof budgetID !== 'undefined' && typeof repetitionID === 'undefined') {
+        columnChart('chart/budget/' + budgetID, 'budgetOverview');
+    }
+    if (typeof budgetID !== 'undefined' && typeof repetitionID !== 'undefined') {
+        lineChart('chart/budget/' + budgetID + '/' + repetitionID, 'budgetOverview');
+    }
+
+});
+
+function updateIncome() {
+    "use strict";
+    $('#defaultModal').empty().load('budgets/income', function () {
+        $('#defaultModal').modal('show');
+    });
+
+    return false;
+}
diff --git a/public/js/categories.js b/public/js/ff/categories/index.js
similarity index 100%
rename from public/js/categories.js
rename to public/js/ff/categories/index.js
diff --git a/public/js/ff/categories/show.js b/public/js/ff/categories/show.js
new file mode 100644
index 0000000000..8bf673924b
--- /dev/null
+++ b/public/js/ff/categories/show.js
@@ -0,0 +1,19 @@
+/* globals $, categoryID, columnChart, categoryDate */
+$(function () {
+    "use strict";
+    if (typeof categoryID !== 'undefined') {
+        // more splits:
+        if ($('#all').length > 0) {
+            columnChart('chart/category/' + categoryID + '/all', 'all');
+        }
+        if ($('#period').length > 0) {
+            columnChart('chart/category/' + categoryID + '/period', 'period');
+        }
+
+    }
+    if (typeof categoryID !== 'undefined' && typeof categoryDate !== undefined) {
+        columnChart('chart/category/' + categoryID + '/period/' + categoryDate, 'period-specific-period');
+    }
+
+
+});
\ No newline at end of file
diff --git a/public/js/ff/categories/show_with_date.js b/public/js/ff/categories/show_with_date.js
new file mode 100644
index 0000000000..8bf673924b
--- /dev/null
+++ b/public/js/ff/categories/show_with_date.js
@@ -0,0 +1,19 @@
+/* globals $, categoryID, columnChart, categoryDate */
+$(function () {
+    "use strict";
+    if (typeof categoryID !== 'undefined') {
+        // more splits:
+        if ($('#all').length > 0) {
+            columnChart('chart/category/' + categoryID + '/all', 'all');
+        }
+        if ($('#period').length > 0) {
+            columnChart('chart/category/' + categoryID + '/period', 'period');
+        }
+
+    }
+    if (typeof categoryID !== 'undefined' && typeof categoryDate !== undefined) {
+        columnChart('chart/category/' + categoryID + '/period/' + categoryDate, 'period-specific-period');
+    }
+
+
+});
\ No newline at end of file
diff --git a/public/js/global/charts.js b/public/js/ff/charts.js
similarity index 100%
rename from public/js/global/charts.js
rename to public/js/ff/charts.js
diff --git a/public/js/export/index.js b/public/js/ff/export/index.js
similarity index 100%
rename from public/js/export/index.js
rename to public/js/ff/export/index.js
diff --git a/public/js/global/firefly.js b/public/js/ff/firefly.js
similarity index 100%
rename from public/js/global/firefly.js
rename to public/js/ff/firefly.js
diff --git a/public/js/guest.js b/public/js/ff/guest.js
similarity index 100%
rename from public/js/guest.js
rename to public/js/ff/guest.js
diff --git a/public/js/global/help.js b/public/js/ff/help.js
similarity index 100%
rename from public/js/global/help.js
rename to public/js/ff/help.js
diff --git a/public/js/index.js b/public/js/ff/index.js
similarity index 100%
rename from public/js/index.js
rename to public/js/ff/index.js
diff --git a/public/js/piggy-banks/index.js b/public/js/ff/piggy-banks/index.js
similarity index 100%
rename from public/js/piggy-banks/index.js
rename to public/js/ff/piggy-banks/index.js
diff --git a/public/js/piggy-banks/show.js b/public/js/ff/piggy-banks/show.js
similarity index 100%
rename from public/js/piggy-banks/show.js
rename to public/js/ff/piggy-banks/show.js
diff --git a/public/js/reports/audit/all.js b/public/js/ff/reports/audit/all.js
similarity index 100%
rename from public/js/reports/audit/all.js
rename to public/js/ff/reports/audit/all.js
diff --git a/public/js/reports/default/all.js b/public/js/ff/reports/default/all.js
similarity index 100%
rename from public/js/reports/default/all.js
rename to public/js/ff/reports/default/all.js
diff --git a/public/js/reports/default/month.js b/public/js/ff/reports/default/month.js
similarity index 100%
rename from public/js/reports/default/month.js
rename to public/js/ff/reports/default/month.js
diff --git a/public/js/reports/default/multi-year.js b/public/js/ff/reports/default/multi-year.js
similarity index 100%
rename from public/js/reports/default/multi-year.js
rename to public/js/ff/reports/default/multi-year.js
diff --git a/public/js/reports/default/year.js b/public/js/ff/reports/default/year.js
similarity index 100%
rename from public/js/reports/default/year.js
rename to public/js/ff/reports/default/year.js
diff --git a/public/js/reports/index.js b/public/js/ff/reports/index.js
similarity index 100%
rename from public/js/reports/index.js
rename to public/js/ff/reports/index.js
diff --git a/public/js/rules/create-edit.js b/public/js/ff/rules/create-edit.js
similarity index 100%
rename from public/js/rules/create-edit.js
rename to public/js/ff/rules/create-edit.js
diff --git a/public/js/rules/create.js b/public/js/ff/rules/create.js
similarity index 100%
rename from public/js/rules/create.js
rename to public/js/ff/rules/create.js
diff --git a/public/js/rules/edit.js b/public/js/ff/rules/edit.js
similarity index 100%
rename from public/js/rules/edit.js
rename to public/js/ff/rules/edit.js
diff --git a/public/js/rules/index.js b/public/js/ff/rules/index.js
similarity index 100%
rename from public/js/rules/index.js
rename to public/js/ff/rules/index.js
diff --git a/public/js/tags.js b/public/js/ff/tags/create.js
similarity index 100%
rename from public/js/tags.js
rename to public/js/ff/tags/create.js
diff --git a/public/js/ff/tags/edit.js b/public/js/ff/tags/edit.js
new file mode 100644
index 0000000000..6ea5731733
--- /dev/null
+++ b/public/js/ff/tags/edit.js
@@ -0,0 +1,104 @@
+/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */
+$(function () {
+    "use strict";
+
+    $('#clearLocation').click(clearLocation);
+
+});
+
+/*
+ Some vars as prep for the map:
+ */
+var map;
+var markers = [];
+var setTag = false;
+
+var mapOptions = {
+    zoom: zoomLevel,
+    center: new google.maps.LatLng(latitude, longitude),
+    disableDefaultUI: true
+};
+
+/*
+ Clear location and reset zoomLevel.
+ */
+function clearLocation() {
+    "use strict";
+    deleteMarkers();
+    $('input[name="latitude"]').val("");
+    $('input[name="longitude"]').val("");
+    $('input[name="zoomLevel"]').val("6");
+    setTag = false;
+    $('input[name="setTag"]').val('false');
+    return false;
+}
+
+function initialize() {
+    "use strict";
+    /*
+    Create new map:
+     */
+    map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions);
+
+    /*
+    Respond to click event.
+     */
+    google.maps.event.addListener(map, 'rightclick', function (event) {
+        placeMarker(event);
+    });
+
+    /*
+    Respond to zoom event.
+     */
+    google.maps.event.addListener(map, 'zoom_changed', function () {
+        saveZoomLevel(event);
+    });
+    /*
+    Maybe place marker?
+     */
+    if(doPlaceMarker) {
+        var myLatlng = new google.maps.LatLng(latitude,longitude);
+        var fakeEvent = {};
+        fakeEvent.latLng = myLatlng;
+        placeMarker(fakeEvent);
+
+    }
+}
+
+/**
+ * save zoom level of map into hidden input.
+ */
+function saveZoomLevel() {
+    "use strict";
+    $('input[name="zoomLevel"]').val(map.getZoom());
+}
+
+/**
+ * Place marker on map.
+ * @param event
+ */
+function placeMarker(event) {
+    "use strict";
+    deleteMarkers();
+    var marker = new google.maps.Marker({position: event.latLng, map: map});
+    $('input[name="latitude"]').val(event.latLng.lat());
+    $('input[name="longitude"]').val(event.latLng.lng());
+    markers.push(marker);
+    setTag = true;
+    $('input[name="setTag"]').val('true');
+}
+
+
+/**
+ * Deletes all markers in the array by removing references to them.
+ */
+function deleteMarkers() {
+    "use strict";
+    for (var i = 0; i < markers.length; i++) {
+        markers[i].setMap(null);
+    }
+    markers = [];
+}
+
+
+google.maps.event.addDomListener(window, 'load', initialize);
\ No newline at end of file
diff --git a/public/js/ff/tags/index.js b/public/js/ff/tags/index.js
new file mode 100644
index 0000000000..6ea5731733
--- /dev/null
+++ b/public/js/ff/tags/index.js
@@ -0,0 +1,104 @@
+/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */
+$(function () {
+    "use strict";
+
+    $('#clearLocation').click(clearLocation);
+
+});
+
+/*
+ Some vars as prep for the map:
+ */
+var map;
+var markers = [];
+var setTag = false;
+
+var mapOptions = {
+    zoom: zoomLevel,
+    center: new google.maps.LatLng(latitude, longitude),
+    disableDefaultUI: true
+};
+
+/*
+ Clear location and reset zoomLevel.
+ */
+function clearLocation() {
+    "use strict";
+    deleteMarkers();
+    $('input[name="latitude"]').val("");
+    $('input[name="longitude"]').val("");
+    $('input[name="zoomLevel"]').val("6");
+    setTag = false;
+    $('input[name="setTag"]').val('false');
+    return false;
+}
+
+function initialize() {
+    "use strict";
+    /*
+    Create new map:
+     */
+    map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions);
+
+    /*
+    Respond to click event.
+     */
+    google.maps.event.addListener(map, 'rightclick', function (event) {
+        placeMarker(event);
+    });
+
+    /*
+    Respond to zoom event.
+     */
+    google.maps.event.addListener(map, 'zoom_changed', function () {
+        saveZoomLevel(event);
+    });
+    /*
+    Maybe place marker?
+     */
+    if(doPlaceMarker) {
+        var myLatlng = new google.maps.LatLng(latitude,longitude);
+        var fakeEvent = {};
+        fakeEvent.latLng = myLatlng;
+        placeMarker(fakeEvent);
+
+    }
+}
+
+/**
+ * save zoom level of map into hidden input.
+ */
+function saveZoomLevel() {
+    "use strict";
+    $('input[name="zoomLevel"]').val(map.getZoom());
+}
+
+/**
+ * Place marker on map.
+ * @param event
+ */
+function placeMarker(event) {
+    "use strict";
+    deleteMarkers();
+    var marker = new google.maps.Marker({position: event.latLng, map: map});
+    $('input[name="latitude"]').val(event.latLng.lat());
+    $('input[name="longitude"]').val(event.latLng.lng());
+    markers.push(marker);
+    setTag = true;
+    $('input[name="setTag"]').val('true');
+}
+
+
+/**
+ * Deletes all markers in the array by removing references to them.
+ */
+function deleteMarkers() {
+    "use strict";
+    for (var i = 0; i < markers.length; i++) {
+        markers[i].setMap(null);
+    }
+    markers = [];
+}
+
+
+google.maps.event.addDomListener(window, 'load', initialize);
\ No newline at end of file
diff --git a/public/js/transactions/create-edit.js b/public/js/ff/transactions/create-edit.js
similarity index 100%
rename from public/js/transactions/create-edit.js
rename to public/js/ff/transactions/create-edit.js
diff --git a/public/js/transactions/create.js b/public/js/ff/transactions/create.js
similarity index 100%
rename from public/js/transactions/create.js
rename to public/js/ff/transactions/create.js
diff --git a/public/js/transactions/edit.js b/public/js/ff/transactions/edit.js
similarity index 100%
rename from public/js/transactions/edit.js
rename to public/js/ff/transactions/edit.js
diff --git a/public/js/bootstrap-sortable.js b/public/js/lib/bootstrap-sortable.js
similarity index 100%
rename from public/js/bootstrap-sortable.js
rename to public/js/lib/bootstrap-sortable.js
diff --git a/public/js/bootstrap-tagsinput.min.js b/public/js/lib/bootstrap-tagsinput.min.js
similarity index 100%
rename from public/js/bootstrap-tagsinput.min.js
rename to public/js/lib/bootstrap-tagsinput.min.js
diff --git a/public/js/bootstrap-tagsinput.min.js.map b/public/js/lib/bootstrap-tagsinput.min.js.map
similarity index 100%
rename from public/js/bootstrap-tagsinput.min.js.map
rename to public/js/lib/bootstrap-tagsinput.min.js.map
diff --git a/public/js/bootstrap3-typeahead.min.js b/public/js/lib/bootstrap3-typeahead.min.js
similarity index 100%
rename from public/js/bootstrap3-typeahead.min.js
rename to public/js/lib/bootstrap3-typeahead.min.js
diff --git a/public/dist/css/AdminLTE.min.css b/public/lib/adminlte/css/AdminLTE.min.css
similarity index 100%
rename from public/dist/css/AdminLTE.min.css
rename to public/lib/adminlte/css/AdminLTE.min.css
diff --git a/public/dist/css/skins/skin-blue-light.min.css b/public/lib/adminlte/css/skins/skin-blue-light.min.css
similarity index 100%
rename from public/dist/css/skins/skin-blue-light.min.css
rename to public/lib/adminlte/css/skins/skin-blue-light.min.css
diff --git a/public/dist/img/icons.png b/public/lib/adminlte/img/icons.png
similarity index 100%
rename from public/dist/img/icons.png
rename to public/lib/adminlte/img/icons.png
diff --git a/public/dist/js/app.min.js b/public/lib/adminlte/js/app.min.js
similarity index 100%
rename from public/dist/js/app.min.js
rename to public/lib/adminlte/js/app.min.js
diff --git a/public/bootstrap/config.json b/public/lib/bootstrap/config.json
similarity index 100%
rename from public/bootstrap/config.json
rename to public/lib/bootstrap/config.json
diff --git a/public/bootstrap/css/bootstrap.min.css b/public/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from public/bootstrap/css/bootstrap.min.css
rename to public/lib/bootstrap/css/bootstrap.min.css
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.eot b/public/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to public/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.svg b/public/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to public/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.ttf b/public/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to public/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.woff b/public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/public/bootstrap/js/bootstrap.min.js b/public/lib/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from public/bootstrap/js/bootstrap.min.js
rename to public/lib/bootstrap/js/bootstrap.min.js
diff --git a/public/font-awesome/css/font-awesome.css b/public/lib/font-awesome/css/font-awesome.css
similarity index 100%
rename from public/font-awesome/css/font-awesome.css
rename to public/lib/font-awesome/css/font-awesome.css
diff --git a/public/font-awesome/css/font-awesome.min.css b/public/lib/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from public/font-awesome/css/font-awesome.min.css
rename to public/lib/font-awesome/css/font-awesome.min.css
diff --git a/public/font-awesome/fonts/FontAwesome.otf b/public/lib/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from public/font-awesome/fonts/FontAwesome.otf
rename to public/lib/font-awesome/fonts/FontAwesome.otf
diff --git a/public/font-awesome/fonts/fontawesome-webfont.eot b/public/lib/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.eot
rename to public/lib/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/public/font-awesome/fonts/fontawesome-webfont.svg b/public/lib/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.svg
rename to public/lib/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/public/font-awesome/fonts/fontawesome-webfont.ttf b/public/lib/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.ttf
rename to public/lib/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/public/font-awesome/fonts/fontawesome-webfont.woff b/public/lib/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.woff
rename to public/lib/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/public/font-awesome/fonts/fontawesome-webfont.woff2 b/public/lib/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from public/font-awesome/fonts/fontawesome-webfont.woff2
rename to public/lib/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig
index 2d175192e8..a1b0377c75 100644
--- a/resources/views/accounts/index.twig
+++ b/resources/views/accounts/index.twig
@@ -49,5 +49,5 @@
     <script type="text/javascript">
         var what = '{{ what }}';
     </script>
-    <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
 {% endblock %}
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 8e8fad0f5f..afb7876f7d 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -53,9 +53,9 @@
         var accountID = {{ account.id }};
     </script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
     <script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
     <script src="js/lib/jquery.color-2.1.2.min.js" type="text/javascript"></script>
-    <script src="js/accounts/show.js" type="text/javascript"></script>
+    <script src="js/ff/accounts/show.js" type="text/javascript"></script>
 
 {% endblock %}
diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig
index a26f4b31f6..55c45db3d5 100644
--- a/resources/views/admin/index.twig
+++ b/resources/views/admin/index.twig
@@ -21,7 +21,3 @@
 </div>
 
 {% endblock %}
-{% block scripts %}
-{% endblock %}
-{% block styles %}
-{% endblock %}
diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig
index 71fe8d4c90..05bd5375f7 100644
--- a/resources/views/admin/users/index.twig
+++ b/resources/views/admin/users/index.twig
@@ -82,7 +82,3 @@
         </div>
     </div>
 {% endblock %}
-{% block scripts %}
-{% endblock %}
-{% block styles %}
-{% endblock %}
diff --git a/resources/views/auth/confirmation/error.twig b/resources/views/auth/confirmation/error.twig
index 02c38dab51..d95de0b214 100644
--- a/resources/views/auth/confirmation/error.twig
+++ b/resources/views/auth/confirmation/error.twig
@@ -7,9 +7,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
diff --git a/resources/views/auth/confirmation/no-resent.twig b/resources/views/auth/confirmation/no-resent.twig
index 8ac79ec1bf..01e079cbad 100644
--- a/resources/views/auth/confirmation/no-resent.twig
+++ b/resources/views/auth/confirmation/no-resent.twig
@@ -7,9 +7,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
diff --git a/resources/views/auth/confirmation/resent.twig b/resources/views/auth/confirmation/resent.twig
index 35d6468f95..c7e0307d3d 100644
--- a/resources/views/auth/confirmation/resent.twig
+++ b/resources/views/auth/confirmation/resent.twig
@@ -7,9 +7,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
diff --git a/resources/views/auth/lost-two-factor.twig b/resources/views/auth/lost-two-factor.twig
index 6d010196b5..7f64e57379 100644
--- a/resources/views/auth/lost-two-factor.twig
+++ b/resources/views/auth/lost-two-factor.twig
@@ -7,9 +7,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index 2cbc1f455c..51e6bff500 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -64,5 +64,5 @@
     <link href="css/bootstrap-tagsinput.css" type="text/css" rel="stylesheet" media="all">
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
 {% endblock %}
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig
index 408f97ff27..f17c54a7f1 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -62,5 +62,5 @@
     <link href="css/bootstrap-tagsinput.css" type="text/css" rel="stylesheet" media="all">
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
 {% endblock %}
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index e8be77cc31..6dc7d22cb1 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -34,5 +34,5 @@
 {% endblock %}
 
 {% block scripts %}
-    <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
 {% endblock %}
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 20058d0b85..3cfebbd4b5 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -111,6 +111,6 @@
         var billID = {{ bill.id }};
     </script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/bills.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/ff/bills/show.js"></script>
 {% endblock %}
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index a086f91f32..b2b1b704da 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -188,5 +188,5 @@
         var budgetIncomeTotal = {{ budgetIncomeTotal }};
     </script>
 
-    <script type="text/javascript" src="js/budgets.js"></script>
+    <script type="text/javascript" src="js/ff/budgets/index.js"></script>
 {% endblock %}
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index d58dc7f544..13c1bd6bb7 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -104,7 +104,7 @@
     </script>
 
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/budgets.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/ff/budgets/show.js"></script>
 
 {% endblock %}
diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig
index cd2f4c913e..a86d8344b8 100644
--- a/resources/views/categories/index.twig
+++ b/resources/views/categories/index.twig
@@ -36,7 +36,7 @@
 
 {% block scripts %}
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
-    <script type="text/javascript" src="js/categories.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
+    <script type="text/javascript" src="js/ff/categories/index.js"></script>
 {% endblock %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 3c504b5b5b..55787e65f1 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -76,7 +76,7 @@
         var categoryID = {{ category.id }};
     </script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/categories.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/ff/categories/show.js"></script>
 
 {% endblock %}
diff --git a/resources/views/categories/show_with_date.twig b/resources/views/categories/show_with_date.twig
index 60892dba50..868e6c4a4f 100644
--- a/resources/views/categories/show_with_date.twig
+++ b/resources/views/categories/show_with_date.twig
@@ -44,7 +44,7 @@
         var categoryDate = "{{ carbon.format('Y-m-d') }}";
     </script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/categories.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/ff/categories/show_with_date.js"></script>
 
 {% endblock %}
diff --git a/resources/views/csv/column-roles.twig b/resources/views/csv/column-roles.twig
index b8a46bd96b..db8e272469 100644
--- a/resources/views/csv/column-roles.twig
+++ b/resources/views/csv/column-roles.twig
@@ -45,10 +45,12 @@
 
                         <table class="table">
                             <thead>
-                            <th style="width:20%;">{{ 'csv_column_name'|_ }}</th>
-                            <th style="width:40%;">{{ 'csv_column_example'|_ }}</th>
-                            <th style="width:30%;">{{ 'csv_column_role'|_ }}</th>
-                            <th style="width:10%;">{{ 'csv_do_map_value'|_ }}</th>
+                            <tr>
+                                <th style="width:20%;">{{ 'csv_column_name'|_ }}</th>
+                                <th style="width:40%;">{{ 'csv_column_example'|_ }}</th>
+                                <th style="width:30%;">{{ 'csv_column_role'|_ }}</th>
+                                <th style="width:10%;">{{ 'csv_do_map_value'|_ }}</th>
+                            </tr>
                             </thead>
                             {% for index,header in headers %}
                                 <tr>
diff --git a/resources/views/csv/map.twig b/resources/views/csv/map.twig
index b5e321df14..ea8ae76510 100644
--- a/resources/views/csv/map.twig
+++ b/resources/views/csv/map.twig
@@ -48,8 +48,10 @@
                         <div class="box-body no-padding">
                             <table class="table table-hover">
                                 <thead>
-                                <th style="width:50%;">{{ 'csv_field_value'|_ }}</th>
-                                <th>{{ 'csv_field_mapped_to'|_ }}</th>
+                                <tr>
+                                    <th style="width:50%;">{{ 'csv_field_value'|_ }}</th>
+                                    <th>{{ 'csv_field_mapped_to'|_ }}</th>
+                                </tr>
                                 </thead>
                                 <tbody>
                                 {% for value in values[index] %}
diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig
index a6bea4e28b..0fd75c042e 100644
--- a/resources/views/errors/500.twig
+++ b/resources/views/errors/500.twig
@@ -11,7 +11,7 @@
             color: #B0BEC5;
             display: table;
             font-weight: 100;
-            font-family: 'Lato';
+            font-family: 'Lato', sans-serif;
         }
 
         .container {
diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig
index ce2e5801ab..3e0a701038 100644
--- a/resources/views/errors/FireflyException.twig
+++ b/resources/views/errors/FireflyException.twig
@@ -7,9 +7,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 33895ec1c0..492b05f418 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -101,5 +101,5 @@
     <script type="text/javascript">
         var jobKey = "{{ job.key }}";
     </script>
-    <script type="text/javascript" src="js/export/index.js"></script>
+    <script type="text/javascript" src="js/ff/export/index.js"></script>
 {% endblock %}
diff --git a/resources/views/index.twig b/resources/views/index.twig
index c3bb48fa1e..c163eb1234 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -251,10 +251,9 @@
         {% endif %}
     </script>
 
-
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/index.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/ff/index.js"></script>
 {% endblock %}
 {% block styles %}
 {% endblock %}
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 3178cc4531..16ee742cef 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -15,10 +15,10 @@
     <base href="{{ route('index') }}/">
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
-    <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
-    <link href="dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css"/>
+    <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+    <link href="lib/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link href="lib/adminlte/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/daterangepicker.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
     <link href="css/bootstrap-tour.min.css" rel="stylesheet" type="text/css"/>
@@ -156,10 +156,10 @@
 </div>
 
 <script src="js/lib/jquery-2.2.3.min.js" type="text/javascript"></script>
-<script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="lib/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
 <script src="js/lib/moment.min.js" type="text/javascript"></script>
 <script src="js/lib/daterangepicker.js" type="text/javascript"></script>
-<script src="dist/js/app.min.js" type="text/javascript"></script>
+<script src="lib/adminlte/js/app.min.js" type="text/javascript"></script>
 <script type="text/javascript" src="js/lib/accounting.min.js"></script>
 <script src="js/lib/bootstrap-tour.min.js" type="text/javascript"></script>
 
@@ -194,8 +194,8 @@
 
 </script>
 
-<script type="text/javascript" src="js/global/firefly.js"></script>
-<script type="text/javascript" src="js/global/help.js"></script>
+<script type="text/javascript" src="js/ff/firefly.js"></script>
+<script type="text/javascript" src="js/ff/help.js"></script>
 {% block scripts %}{% endblock %}
 
 {% if env('ANALYTICS_ID','') != '' %}
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index 0e82247ef3..8c43d0af12 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -7,9 +7,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
 
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
@@ -28,8 +28,8 @@
     {% block content %}{% endblock %}
 </div>
 <!-- /.login-box -->
-<script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
-<script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="js/lib/jquery-2.2.3.min.js"></script>
+<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js"></script>
 
 {% if env('ANALYTICS_ID','') != '' %}
     <script>
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index 1cf22e7b96..65e73b0002 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -16,9 +16,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
-    <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
-    <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
+    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" type="text/css" media="all"/>
+    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" type="text/css" media="all"/>
+    <link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!--[if lt IE 9]>
@@ -38,9 +38,9 @@
     {% block content %}{% endblock %}
 </div>
 <!-- /.login-box -->
-<script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
-<script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="js/guest.js"></script>
+<script type="text/javascript" src="js/lib/jquery-2.2.3.min.js"></script>
+<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="js/ff/guest.js"></script>
 
 {% if env('ANALYTICS_ID','') != '' %}
     <script>
diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig
index 3e2ac4861b..b01ceac8b7 100644
--- a/resources/views/piggy-banks/index.twig
+++ b/resources/views/piggy-banks/index.twig
@@ -58,5 +58,5 @@
 {% endblock %}
 {% block scripts %}
     <script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
-    <script type="text/javascript" src="js/piggy-banks/index.js"></script>
+    <script type="text/javascript" src="js/ff/piggy-banks/index.js"></script>
 {% endblock %}
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 75aa0d8963..d5240e028c 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -93,6 +93,6 @@
     </script>
 
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
-    <script type="text/javascript" src="js/piggy-banks/show.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/ff/piggy-banks/show.js"></script>
 {% endblock %}
diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig
index 7ccaf58785..9d3687d93f 100644
--- a/resources/views/profile/change-password.twig
+++ b/resources/views/profile/change-password.twig
@@ -17,11 +17,9 @@
 
                     {% if errors|length > 0 %}
                         <ul>
-                            <ul>
-                                {% for error in errors.all %}
-                                    <li class="text-danger">{{ error }}</li>
-                                {% endfor %}
-                            </ul>
+                            {% for error in errors.all %}
+                                <li class="text-danger">{{ error }}</li>
+                            {% endfor %}
                         </ul>
 
                     {% endif %}
diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig
index 1f61ca9103..188e5ab6b0 100644
--- a/resources/views/profile/delete-account.twig
+++ b/resources/views/profile/delete-account.twig
@@ -26,11 +26,9 @@
 
                     {% if errors|length > 0 %}
                         <ul>
-                            <ul>
-                                {% for error in errors.all %}
-                                    <li class="text-danger">{{ error }}</li>
-                                {% endfor %}
-                            </ul>
+                            {% for error in errors.all %}
+                                <li class="text-danger">{{ error }}</li>
+                            {% endfor %}
                         </ul>
 
                     {% endif %}
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index a24710d1ab..4c8f5b5cc8 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -88,5 +88,5 @@
     <script type="text/javascript">
         var hideable = {{ hideable|json_encode|raw }};
     </script>
-    <script type="text/javascript" src="js/reports/audit/all.js"></script>
+    <script type="text/javascript" src="js/ff/reports/audit/all.js"></script>
 {% endblock %}
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 6b15db4071..6e34e689b1 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -72,9 +72,9 @@
 {% endblock %}
 {% block scripts %}
 
-    <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
     <script type="text/javascript">
         var year = {{ start.year }};
         var month = {{ start.month }};
@@ -94,6 +94,6 @@
         var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}';
         var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}';
     </script>
-    <script type="text/javascript" src="js/reports/default/all.js"></script>
-    <script type="text/javascript" src="js/reports/default/month.js"></script>
+    <script type="text/javascript" src="js/ff/reports/default/all.js"></script>
+    <script type="text/javascript" src="js/ff/reports/default/month.js"></script>
 {% endblock %}
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index 0b668e2ddd..c1fdfc3389 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -153,9 +153,9 @@
 {% endblock %}
 {% block scripts %}
 
-    <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
     <script type="text/javascript">
         var year = {{ start.year }};
         var month = {{ start.month }};
@@ -176,6 +176,6 @@
         var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}';
 
     </script>
-    <script type="text/javascript" src="js/reports/default/all.js"></script>
-    <script type="text/javascript" src="js/reports/default/multi-year.js"></script>
+    <script type="text/javascript" src="js/ff/reports/default/all.js"></script>
+    <script type="text/javascript" src="js/ff/reports/default/multi-year.js"></script>
 {% endblock %}
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index d6b07d6043..43b6b4e9be 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -103,7 +103,7 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
-    <script type="text/javascript" src="js/global/charts.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
     <script type="text/javascript">
         var year = '{{ start.year }}';
 
@@ -124,7 +124,7 @@
         var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}';
     </script>
 
-    <script type="text/javascript" src="js/reports/default/all.js"></script>
-    <script type="text/javascript" src="js/reports/default/year.js"></script>
+    <script type="text/javascript" src="js/ff/reports/default/all.js"></script>
+    <script type="text/javascript" src="js/ff/reports/default/year.js"></script>
 
 {% endblock %}
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig
index 218f280a71..bab746d9ff 100644
--- a/resources/views/reports/index.twig
+++ b/resources/views/reports/index.twig
@@ -154,5 +154,5 @@
         var picker;
     </script>
 
-    <script type="text/javascript" src="js/reports/index.js"></script>
+    <script type="text/javascript" src="js/ff/reports/index.js"></script>
 {% endblock %}
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index df5e4a631d..1e478b4374 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -195,6 +195,6 @@
 
 {% endblock %}
 {% block scripts %}
-    <script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
-    <script type="text/javascript" src="js/rules/index.js"></script>
+    <script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="js/ff/rules/index.js"></script>
 {% endblock %}
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 6edc787b25..6b4b5ca25c 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -125,10 +125,10 @@
 
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="js/rules/create-edit.js"></script>
+    <script type="text/javascript" src="js/ff/rules/create-edit.js"></script>
     <script type="text/javascript">
         var triggerCount = {{ triggerCount }};
         var actionCount = {{ actionCount }};
     </script>
-    <script type="text/javascript" src="js/rules/create.js"></script>
+    <script type="text/javascript" src="js/ff/rules/create.js"></script>
 {% endblock %}
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 72b2037f1f..c530927a10 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -126,10 +126,10 @@
 
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="js/rules/create-edit.js"></script>
+    <script type="text/javascript" src="js/ff/rules/create-edit.js"></script>
     <script type="text/javascript">
         var triggerCount = {{ triggerCount }};
         var actionCount = {{ actionCount }};
     </script>
-    <script type="text/javascript" src="js/rules/edit.js"></script>
+    <script type="text/javascript" src="js/ff/rules/edit.js"></script>
 {% endblock %}
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index a17502ef4c..e0d9de79bd 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -54,16 +54,18 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
+        var latitude;
         {% if Input.old('latitude') %}
-        var latitude = "{{ Input.old('latitude') }}";
+        latitude = "{{ Input.old('latitude') }}";
         {% else %}
-        var latitude = "52.3167";
+        latitude = "52.3167";
         {% endif %}
 
+        var doPlaceMarker;
         {% if Input.old('latitude') and Input.old('longitude') and Input.old('zoomLevel') %}
-        var doPlaceMarker = true;
+        doPlaceMarker = true;
         {% else %}
-        var doPlaceMarker = false;
+        doPlaceMarker = false;
         {% endif %}
 
         {% if Input.old('longitude') %}
@@ -80,5 +82,5 @@
 
     </script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3"></script>
-    <script src="js/tags.js"></script>
+    <script src="js/ff/tags/create.js"></script>
 {% endblock %}
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index e03c331366..0fc6ec210d 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -84,5 +84,5 @@
 
     </script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3"></script>
-    <script src="js/tags.js"></script>
+    <script src="js/ff/tags/edit.js"></script>
 {% endblock %}
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index 5da35bc9bd..c50f1c5908 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -81,5 +81,5 @@
 
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="js/tags.js"></script>
+    <script src="js/ff/tags/index.js"></script>
 {% endblock %}
diff --git a/resources/views/transactions/create.twig b/resources/views/transactions/create.twig
index d93560c4d5..be67202fde 100644
--- a/resources/views/transactions/create.twig
+++ b/resources/views/transactions/create.twig
@@ -132,10 +132,10 @@
         {% endfor %}
 
     </script>
-    <script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
-    <script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>
-    <script type="text/javascript" src="js/transactions/create-edit.js"></script>
-    <script type="text/javascript" src="js/transactions/create.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/create-edit.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/create.js"></script>
 {% endblock %}
 
 {% block styles %}
diff --git a/resources/views/transactions/edit.twig b/resources/views/transactions/edit.twig
index e342dcf81e..03b09a1a77 100644
--- a/resources/views/transactions/edit.twig
+++ b/resources/views/transactions/edit.twig
@@ -114,10 +114,10 @@
     <script type="text/javascript">
         var what = "{{ what }}";
     </script>
-    <script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
-    <script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>
-    <script type="text/javascript" src="js/transactions/create-edit.js"></script>
-    <script type="text/javascript" src="js/transactions/edit.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/create-edit.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/edit.js"></script>
 {% endblock %}
 {% block styles %}
     <link href="css/bootstrap-tagsinput.css" type="text/css" rel="stylesheet" media="all">
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index ee510c2381..a15a52aafe 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -118,7 +118,7 @@
                                     </td>
                                     <td>
                                         <i class="fa {{ att.mime|mimeIcon }}"></i>
-                                        <a href="{{ route('attachments.download', att.id) }}" tle="{{ att.filename }}">
+                                        <a href="{{ route('attachments.download', att.id) }}" title="{{ att.filename }}">
                                             {% if att.title %}
                                                 {{ att.title }}
                                             {% else %}
@@ -132,7 +132,7 @@
                                         {% endif %}
                                     </td>
                                     <td style="width:100px;">
-                                        <img src="{{ route('attachments.preview', att.id) }}"></img>
+                                        <img src="{{ route('attachments.preview', att.id) }}" />
                                     </td>
                                 </tr>
                             {% endfor %}