diff --git a/resources/views/admin/widgets/association.blade.php b/resources/views/admin/widgets/association.blade.php
index 5ac74f6f..67679ad5 100644
--- a/resources/views/admin/widgets/association.blade.php
+++ b/resources/views/admin/widgets/association.blade.php
@@ -1,61 +1,15 @@
-@extends('admin.layout')
+@extends('admin.layoutWithNavigation')
 
 @section('pageName', @trans('admin/widgets.overview'))
 
 @section('content')
     <div class="row">
-
-        @if (session('success'))
-            <div class="callout success">
-                {{ session('success') }}
-            </div>
-        @endif
-
-        @if (session('error'))
-            <div class="callout alert">
-                {{ session('error') }}
-            </div>
-        @endif
-
-        <div class="column large-9 tile-overview" data-equalizer>
-
+        <div class="col-lg-9 sameheight-container">
             <h2>@lang('admin/widgets.overview')</h2>
 
-            @forelse($widgets as $widget)
-                <div class="column large-4">
-                    <div class="item" data-equalizer-watch>
-                        <h4>{{str_limit($widget->name, 20)}}</h4>
-                        <p>
-                            {{trans(call_user_func([$widget->widget_type_handler, 'getName']))}}
-                        </p>
-                        <p>
-                            {{str_limit($widget->description, 150)}}
-                        </p>
-
-                        <div class="controls row text-center">
-                            <a href="{{route('widgets.edit', ['id' => $widget->id])}}" class="button column large-6 primary"><i class="fa fa-edit"></i></a>
-
-                            @if (in_array($widget->id, $associatedWidgetIds))
-                                <a href="{{route('widgets.deleteAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"
-                                   class="button column confirm large-6 alert">
-                                    <i class="fa fa-trash"></i>
-                                </a>
-                            @else
-                                <a href="{{route('widgets.makeAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"
-                                   class="button column large-6 success"><i class="fa fa-plus"></i></a>
-                            @endif
-                        </div>
-                    </div>
-                </div>
-            @empty
-                <em>@lang('admin/widgets.noEntries')</em>
-            @endforelse
-
-            <div class="row">
-                {!! $widgets->render() !!}
-            </div>
+            @include('admin.widgets.widgetsToAssociate', ['tileClass' => 'col-lg-3 col-md-4 col-sm-6 col-xs-12'])
         </div>
-        <div class="column large-3">
+        <div class="col-lg-3">
             <h2>{{$widgetArea->name}}</h2>
 
             <p>
@@ -63,11 +17,11 @@
             </p>
 
             <ul>
-                <li>@lang('admin/widgets.createdAt'): {{$widgetArea->created_at}}</li>
-                <li>@lang('admin/widgets.updatedAt'): {{$widgetArea->updated_at}}</li>
+                <li>@lang('admin/widgets.createdAt'): @date($widgetArea->created_at)</li>
+                <li>@lang('admin/widgets.updatedAt'): @date($widgetArea->updated_at)</li>
             </ul>
 
-            <a href="{{route('widgetareas.edit', ['id' => $widgetArea->id])}}">@lang('admin/widgetAreas.editButton')</a>
+            <a href="{{route('widgetareas.edit', ['id' => $widgetArea->id])}}" class="btn btn-secondary col-sm-12">@lang('admin/widgetAreas.editButton')</a>
 
             @if (!empty($associatedWidgetIds))
                 <h3>@lang('admin/widgets.preview')</h3>
diff --git a/resources/views/admin/widgets/widgetsToAssociate.blade.php b/resources/views/admin/widgets/widgetsToAssociate.blade.php
index b54fc505..81671c3f 100644
--- a/resources/views/admin/widgets/widgetsToAssociate.blade.php
+++ b/resources/views/admin/widgets/widgetsToAssociate.blade.php
@@ -2,7 +2,7 @@
     <div class="{{$tileClass}}">
         <div class=" card @if (in_array($widget->id, $associatedWidgetIds)) card-info @else card-success @endif">
 
-            <div class="card-header">
+            <div class="card-header sameheight-item ">
                 <div class="header-block">
                     <p class="title" title="{{$widget->name}}"
                        data-toggle="tooltip"> {{str_limit($widget->name, 15)}}</p>