diff --git a/resources/views/admin/fileManager/directories/subdirectoriesTiles.blade.php b/resources/views/admin/fileManager/directories/subdirectoriesTiles.blade.php
index 6f0fcf00..541818aa 100644
--- a/resources/views/admin/fileManager/directories/subdirectoriesTiles.blade.php
+++ b/resources/views/admin/fileManager/directories/subdirectoriesTiles.blade.php
@@ -1,29 +1,19 @@
-<div class="row">
-    @if($directory->id)
-        <div class="col-md-2 text-center file-preview">
-            <div class="icon">
-                <a href="{{route('upload.overview', ['id' => $directory->parent_id])}}">
-                    <i class="fa fa-2x fa-level-up"></i>
-                </a>
-            </div>
+@if($directory->id)
+    <div class="col-sm-4 col-md-3 text-center">
+        @include('admin.snippets.card', [
+        'body' => '<a href="'.route('upload.overview', ['id' => $directory->parent_id]).'"><p><i class="fa fa-2x fa-level-up"></i><br />'.trans('admin/fileManager.parentDirectory').'</p></a>',
+        'cardClass' => 'file-preview',
+    ])
+    </div>
+@endif
 
-            <a href="{{route('upload.overview', ['id' => $directory->parent_id])}}">
-                @lang('admin/fileManager.parentDirectory')
-            </a>
+@foreach($subdirectories as $dir)
+    <div class="col-sm-4 col-md-3 text-center">
+        @include('admin.snippets.card', [
+        'body' => '<a href="'.route('upload.overview', ['id' => $dir->id]).'"><p><i class="fa fa-2x fa-folder"></i><br />'.e(str_limit($dir->name, 15)).'</p></a>',
+        'cardClass' => 'file-preview',
+    ])
+    </div>
+@endforeach
 
-        </div>
-    @endif
-
-    @foreach($subdirectories as $dir)
-        <div class="col-md-2 text-center file-preview">
-            <div class="icon">
-                <a href="{{route('upload.overview', ['id' => $dir->id])}}">
-                    <i class="fa fa-2x fa-folder"></i>
-                </a>
-            </div>
-            <a href="{{route('upload.overview', ['id' => $dir->id])}}">
-                {{str_limit($dir->name, 15)}}
-            </a>
-        </div>
-    @endforeach
-</div>
+<div class="clearfix"></div>
diff --git a/resources/views/admin/fileManager/filesTiles.blade.php b/resources/views/admin/fileManager/filesTiles.blade.php
index 7dc60913..0408c2e3 100644
--- a/resources/views/admin/fileManager/filesTiles.blade.php
+++ b/resources/views/admin/fileManager/filesTiles.blade.php
@@ -1,18 +1,18 @@
-    @forelse($files as $file)
-        <div class="col-sm-4 col-md-3 text-center">
-            @include('admin.snippets.card', [
-            'body' => '<a href="'.route('upload.detail', ['id' => $file->id]).'">'.\App\Helpers\FileManager::getPreview($file).'</a>',
-            'footerClass' => 'text-right',
-            'cardClass' => 'file-preview',
-            'footer' => (!isset($hideDelete) || !$hideDelete) ? '<a href="'.route('upload.delete', ['id' => $file->id]).'" data-toggle="tooltip"
-                   class="btn btn-sm btn-danger confirm"
-                   title="'.trans('admin/fileManager.delete').'">
-                    <i class="fa fa-trash"></i>
-                </a>' : '',
-        ])
-        </div>
-    @empty
-        <div class="alert alert-info">
-            <em>@lang('admin/fileManager.noFiles')</em>
-        </div>
-    @endforelse
\ No newline at end of file
+@forelse($files as $file)
+    <div class="col-sm-4 col-md-3 text-center">
+        @include('admin.snippets.card', [
+        'body' => '<a href="'.route('upload.detail', ['id' => $file->id]).'">'.\App\Helpers\FileManager::getPreview($file).'</a>',
+        'footerClass' => 'text-right',
+        'cardClass' => 'file-preview',
+        'footer' => (!isset($hideDelete) || !$hideDelete) ? '<a href="'.route('upload.delete', ['id' => $file->id]).'" data-toggle="tooltip"
+               class="btn btn-sm btn-danger confirm"
+               title="'.trans('admin/fileManager.delete').'">
+                <i class="fa fa-trash"></i>
+            </a>' : '',
+    ])
+    </div>
+@empty
+    <div class="alert alert-info">
+        <em>@lang('admin/fileManager.noFiles')</em>
+    </div>
+@endforelse
\ No newline at end of file
diff --git a/resources/views/admin/snippets/card.blade.php b/resources/views/admin/snippets/card.blade.php
index f570e4fe..66e4d89f 100644
--- a/resources/views/admin/snippets/card.blade.php
+++ b/resources/views/admin/snippets/card.blade.php
@@ -1,15 +1,17 @@
 <div class="card {{isset($type) ? 'card-'.$type : 'card-default'}}  {{$cardClass or ''}}">
     @if(!empty($title))
-    <div class="card-header">
-        <div class="header-block">
-            <p class="title"> {!! $title !!} </p>
+        <div class="card-header">
+            <div class="header-block">
+                <p class="title"> {!! $title !!} </p>
+            </div>
         </div>
-    </div>
     @endif
     <div class="card-block">
         {!! $body !!}
     </div>
-    <div class="card-footer {{$footerClass or ''}}">
-        {!! $footer !!}
-    </div>
+    @if(isset($footer))
+        <div class="card-footer {{$footerClass or ''}}">
+            {!! $footer !!}
+        </div>
+    @endif
 </div>
\ No newline at end of file