diff --git a/resources/assets/admin/css/vendor.css b/resources/assets/admin/css/vendor.css
index cf88e7de..85fc56f3 100644
--- a/resources/assets/admin/css/vendor.css
+++ b/resources/assets/admin/css/vendor.css
@@ -14369,10 +14369,7 @@ img {
 }
 
 .truncate {
-	width: 90%;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
+	word-break: break-all;
 }
 
 .bold {
diff --git a/resources/views/admin/fileManager/filesTiles.blade.php b/resources/views/admin/fileManager/filesTiles.blade.php
index 4499d640..e5a2a29b 100644
--- a/resources/views/admin/fileManager/filesTiles.blade.php
+++ b/resources/views/admin/fileManager/filesTiles.blade.php
@@ -7,12 +7,16 @@
                 </a>
             </div>
 
-            <a href="{{route('upload.detail', ['id' => $file->id])}}">
-                {{str_limit($file->original_filename, 10)}}
-            </a>```
+            <div>
+                <a href="{{route('upload.detail', ['id' => $file->id])}}">
+                    {{str_limit($file->original_filename, 10)}}
+                </a>
+            </div>
+
 
             @if(!isset($hideDelete) || !$hideDelete)
-                <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-sm btn-danger confirm"
+                <a href="{{route('upload.delete', ['id' => $file->id])}}" data-toggle="tooltip"
+                   class="btn btn-sm rounded btn-danger confirm"
                    title="@lang('admin/fileManager.delete')">
                     <i class="fa fa-trash"></i>
                 </a>
diff --git a/resources/views/admin/settings/overview.blade.php b/resources/views/admin/settings/overview.blade.php
index 6dcf41c4..0177d9fa 100644
--- a/resources/views/admin/settings/overview.blade.php
+++ b/resources/views/admin/settings/overview.blade.php
@@ -6,27 +6,32 @@
     <form action="{{route('settings.save')}}" method="POST">
         {!! csrf_field() !!}
 
-        <ul class="nav nav-tabs nav-tabs-bordered" role="tablist">
-            @foreach($formSections as $id => $section)
-                <li class="nav-item">
-                    <a class="nav-link @if($section->getId() == reset($formSections)->getId()) active @endif"
-                       data-toggle="tab"
-                       href="#{{$section->getId()}}" role="tab"
-                       aria-controls="{{$section->getId()}}">{{trans($section->getName())}}</a>
-                </li>
-            @endforeach
-        </ul>
+        <div class="card">
+            <div class="card-block">
+                <ul class="nav nav-pills nav-pills-bordered" role="tablist">
+                    @foreach($formSections as $id => $section)
+                        <li class="nav-item">
+                            <a class="nav-link @if($section->getId() == reset($formSections)->getId()) active @endif"
+                               data-toggle="tab"
+                               href="#{{$section->getId()}}" role="tab"
+                               aria-controls="{{$section->getId()}}">{{trans($section->getName())}}</a>
+                        </li>
+                    @endforeach
+                </ul>
 
-        <div class="tab-content tabs-bordered card">
-
-            @foreach($formSections as $section => $view)
-                <div class="tab-pane @if($view == reset($formSections)) active @endif" id="{{$section}}"
-                     role="tabpanel">
-                    @include($view->getView())
+                <div class="tab-content">
+                    @foreach($formSections as $section => $view)
+                        <div class="tab-pane fade @if($view == reset($formSections)) in active @endif" id="{{$section}}"
+                             role="tabpanel">
+                            @include($view->getView())
+                        </div>
+                    @endforeach
                 </div>
-            @endforeach
 
+                <button type="submit" class="btn btn-primary">@lang('admin/settings.save')</button>
+            </div>
         </div>
-        <button type="submit" class="btn btn-primary">@lang('admin/settings.save')</button>
+
+
     </form>
 @stop
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/detail.blade.php b/resources/views/admin/userManagement/detail.blade.php
index 0ea89934..fe2eca6d 100644
--- a/resources/views/admin/userManagement/detail.blade.php
+++ b/resources/views/admin/userManagement/detail.blade.php
@@ -53,12 +53,12 @@
                 </div>
 
                 <div class="tab-pane" id="user-edit" role="tabpanel">
-                    @include('admin.userManagement.editForm')
+                    @include('admin.userManagement.editForm', ['states' => $statuses])
                 </div>
 
                 <div class="tab-pane" id="user-actions" role="tabpanel">
-                    <ul class="timeline">
-                        @if (!empty($actions))
+                    @if (!empty($actions))
+                        <ul class="timeline">
                             <?php $odd = false; ?>
 
                             @foreach($actions as $action)
@@ -79,7 +79,7 @@
                                     </div>
                                 </li>
                             @endforeach
-                    </ul>
+                        </ul>
                     @else
                         <div class="alert alert-info">
                             <em>@lang('admin/userManagement.noActions')</em>
diff --git a/resources/views/admin/userManagement/overview.blade.php b/resources/views/admin/userManagement/overview.blade.php
index 9442ecec..2b8f1ba7 100644
--- a/resources/views/admin/userManagement/overview.blade.php
+++ b/resources/views/admin/userManagement/overview.blade.php
@@ -10,12 +10,12 @@
 @endsection
 
 @section('content')
-    <div class="row users-list">
+    <div class="row users-list sameheight-container">
         @forelse($users as $user)
-            <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 ">
-                <div class="card card-default ">
-                    <div class="card-block truncate">
-                        <div class="cl-xs-12 text-center">
+            <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+                <div class="card card-default">
+                    <div class="card-block container truncate sameheight-item">
+                        <div class="col-xs-12 text-center">
                             <a href="{{route('users.edit', ['id' => $user->id])}}">
                                 <img src="{{$user->gravatar(100)}}" alt="" />
                             </a>
@@ -29,9 +29,9 @@
                         </div>
                     </div>
                     <div class="card-footer text-right">
+                        <a href="{{route('users.detail', ['id' => $user->id])}}" class="btn btn-secondary"><i class="fa fa-info"></i></a>
                         <a href="{{route('users.edit', ['id' => $user->id])}}" class="btn btn-primary"><i
                                     class="fa fa-pencil edit"></i></a>
-                        <a href="#" class="btn btn-danger"><i class="fa fa-trash edit"></i></a>
                     </div>
                 </div>
             </div>