diff --git a/resources/views/admin/content/_partials/overviewRow.blade.php b/resources/views/admin/content/_partials/overviewRow.blade.php
index 1c955437..72c4bd05 100644
--- a/resources/views/admin/content/_partials/overviewRow.blade.php
+++ b/resources/views/admin/content/_partials/overviewRow.blade.php
@@ -3,22 +3,18 @@
         @can('update', $page)
             <a href="{{route('content.edit', ['page' => $page])}}">
                 @if(!view()->exists(template_name($page->template, false)))
-                    <i class="fa fa-2x text-warning fa-warning" data-toggle="tooltip"
-                       title="@lang('admin/contents.invalidTemplateSelected')"></i>
+                    <i class="fa fa-2x text-warning fa-warning" data-toggle="tooltip" title="@lang('admin/contents.invalidTemplateSelected')"></i>
                 @else
                     @if(!empty($page->titlePhoto))
                         <div class="thumbnail" style="background-image: url(@thumbnail($page->titlePhoto))"></div>
                     @else
-                        <img src="{{asset('resources/assets/admin/img/placeholder.png')}}"
-                             class="placeholder"
-                             alt="{{$page->title}}" />
+                        <img src="{{asset('resources/assets/admin/img/placeholder.png')}}" class="placeholder" alt="{{$page->title}}" />
                     @endif
                 @endif
             </a>
         @else
             @if(!empty($page->titlePhoto))
-                <img src="@thumbnail($page->titlePhoto)" class="placeholder"
-                     alt="{{$page->title}}" />
+                <img src="@thumbnail($page->titlePhoto)" class="placeholder" alt="{{$page->title}}" />
             @endif
         @endcan
     </div>
@@ -31,9 +27,11 @@
             {{$page->title}}
         @endcan
 
+        @if ($page->subpages->count() > 0)
+            &nbsp;({{$page->subpages->count()}})
+        @endif
 
-        @if($page->isHomepage) <span
-                class="m-l-10 tag tag-primary">@lang('admin/contents.homepage')</span> @endif
+        @if($page->isHomepage) <span class="m-l-10 tag tag-primary">@lang('admin/contents.homepage')</span> @endif
     </div>
     <div class="col-lg-2 col-md-3 hidden-sm-down">
                         <span class="tag @if($page->isPublic()) tag-success
@@ -66,9 +64,7 @@
                     @if(!$page->isHomepage)
                         @can('set-homepage', $page)
                             <li>
-                                <a href="{{route('content.setHomepage', ['page' => $page])}}"
-                                   data-toggle="tooltip"
-                                   title="@lang('admin/contents.setHomepage')">
+                                <a href="{{route('content.setHomepage', ['page' => $page])}}" data-toggle="tooltip" title="@lang('admin/contents.setHomepage')">
                                     <i class="fa fa-home"></i>
                                 </a>
                             </li>
@@ -77,8 +73,7 @@
 
                     @can('update', $page)
                         <li>
-                            <a class="edit" href="{{route('content.edit', ['page' => $page])}}"
-                               data-toggle="tooltip" title="@lang('admin/contents.editPlain')">
+                            <a class="edit" href="{{route('content.edit', ['page' => $page])}}" data-toggle="tooltip" title="@lang('admin/contents.editPlain')">
                                 <i class="fa fa-pencil"></i>
                             </a>
                         </li>
@@ -87,35 +82,26 @@
                     @if($page->isDraft())
                         @can('publish', $page)
                             <li>
-                                <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'public'])}}"
-                                   class="confirm" data-toggle="tooltip"
-                                   title="@lang('admin/contents.makePublic')">
+                                <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'public'])}}" class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makePublic')">
                                     <i class="fa fa-eye"></i>
                                 </a>
                             </li>
                         @endcan
                         @can('protect', $page)
                             <li>
-                                <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'protected'])}}"
-                                   class="confirm" data-toggle="tooltip"
-                                   title="@lang('admin/contents.makeProtected')">
+                                <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'protected'])}}" class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makeProtected')">
                                     <i class="fa fa-lock"></i>
                                 </a>
                             </li>
                         @endcan
                     @else
                         <li>
-                            <a href="{{route('page.content', ['url' => $page->url])}}"
-                               target="_blank"
-                               data-toggle="tooltip" title="@lang('admin/contents.viewPage')"
-                               class="button tiny secondary"><i class="fa fa-globe"></i>
+                            <a href="{{route('page.content', ['url' => $page->url])}}" target="_blank" data-toggle="tooltip" title="@lang('admin/contents.viewPage')" class="button tiny secondary"><i class="fa fa-globe"></i>
                             </a>
                         </li>
                         @can('draft', $page)
                             <li>
-                                <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'draft'])}}"
-                                   class="button tiny warning confirm" data-toggle="tooltip"
-                                   title="@lang('admin/contents.makeDraft')">
+                                <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'draft'])}}" class="button tiny warning confirm" data-toggle="tooltip" title="@lang('admin/contents.makeDraft')">
                                     <i class="fa fa-eye-slash"></i>
                                 </a>
                             </li>
@@ -124,10 +110,7 @@
 
                     @can('delete', $page)
                         <li>
-                            <a href="{{route('content.delete', ['page' => $page])}}"
-                               class="button tiny alert remove confirm" data-toggle="tooltip"
-                               title="@lang('admin/contents.deletePage')"><i
-                                        class="fa fa-trash-o"></i>
+                            <a href="{{route('content.delete', ['page' => $page])}}" class="button tiny alert remove confirm" data-toggle="tooltip" title="@lang('admin/contents.deletePage')"><i class="fa fa-trash-o"></i>
                             </a>
                         </li>
                     @endcan
@@ -136,4 +119,9 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+
+@foreach($page->subpages as $s)
+    @include('admin.content._partials.overviewRow', ['page' => $s, 'extraClass' => $s->subpages->isEmpty() ? 'subpage hidden-xs-up' : 'subpage hidden-xs-up has-subpages'])
+@endforeach
\ No newline at end of file
diff --git a/resources/views/admin/content/overview.blade.php b/resources/views/admin/content/overview.blade.php
index 84c21fde..2f305efa 100644
--- a/resources/views/admin/content/overview.blade.php
+++ b/resources/views/admin/content/overview.blade.php
@@ -51,10 +51,6 @@
                     </div>
                     @foreach($pages as $page)
                         @include('admin.content._partials.overviewRow', ['extraClass' => $page->subpages->isEmpty() ?: 'has-subpages'])
-
-                        @foreach($page->subpages as $subpage)
-                            @include('admin.content._partials.overviewRow', ['page' => $subpage, 'extraClass' => 'subpage hidden-xs-up'])
-                        @endforeach
                     @endforeach
                 </div>
             </div>