diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 1d26e17f43..8add2bdce6 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -273,7 +273,7 @@ class AccountController extends Controller
         $start = $repository->oldestJournalDate($account);
         $end   = $repository->newestJournalDate($account);
 
-        return view('accounts.show_with_date', compact('account', 'journals', 'subTitle', 'start', 'end'));
+        return view('accounts.show-by-date', compact('account', 'journals', 'subTitle', 'start', 'end'));
     }
 
     /**
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index 33f0d43ff9..cc393df917 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -155,45 +155,48 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-lg-6">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'average_spending_per_account'|_ }}</h3>
-                </div>
-                <div class="box-body table-responsive no-padding">
-                    <table class="table table-hover sortable">
-                        <thead>
-                        <tr>
-                            <th data-defaultsign="az">{{ 'account'|_ }}</th>
-                            <th data-defaultsign="_19">{{ 'spent_average'|_ }}</th>
-                            <th data-defaultsign="_19">{{ 'total'|_ }}</th>
-                            <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {% for row in averageExpenses %}
+        {% if averageExpenses|length > 0 %}
+            <div class="col-lg-6">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'average_spending_per_account'|_ }}</h3>
+                    </div>
+                    <div class="box-body table-responsive no-padding">
+                        <table class="table table-hover sortable">
+                            <thead>
                             <tr>
-                                <td data-value="{{ row.name }}">
-                                    <a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
-                                </td>
-                                <td data-value="{{ row.average }}">
-                                    {{ row.average|formatAmount }}
-                                </td>
-                                <td data-value="{{ row.sum }}">
-                                    {{ row.sum|formatAmount }}
-                                </td>
-                                <td data-value="{{ row.count }}">
-                                    {{ row.count }}
-                                </td>
+                                <th data-defaultsign="az">{{ 'account'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'spent_average'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'total'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
                             </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
+                            </thead>
+                            <tbody>
+                            {% for row in averageExpenses %}
+                                <tr>
+                                    <td data-value="{{ row.name }}">
+                                        <a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
+                                    </td>
+                                    <td data-value="{{ row.average }}">
+                                        {{ row.average|formatAmount }}
+                                    </td>
+                                    <td data-value="{{ row.sum }}">
+                                        {{ row.sum|formatAmount }}
+                                    </td>
+                                    <td data-value="{{ row.count }}">
+                                        {{ row.count }}
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="col-lg-6">
-            {% if topExpenses.count > 0 %}
+        {% endif %}
+        {% if topExpenses.count > 0 %}
+            <div class="col-lg-6">
+
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
@@ -250,8 +253,8 @@
                         </table>
                     </div>
                 </div>
-            {% endif %}
-        </div>
+            </div>
+        {% endif %}
     </div>
     <div class="row">
         {% if averageIncome|length > 0 %}
diff --git a/routes/web.php b/routes/web.php
index 7a10a32aba..e96979ecfe 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -619,7 +619,7 @@ Route::group(
  * Transaction Mass Controller
  */
 Route::group(
-    ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass'], function () {
+    ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'], function () {
     Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']);
     Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']);
     Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']);