diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index 408810b..fef8fa9 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -3,7 +3,7 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="b14a34b0-0127-4886-964a-7be75a2281ac" name="Development" url="http://blue-twilight-dev.andys.eu">
-        <fileTransfer host="scar.andys.eu" port="22" privateKey="C:\Users\aheathershaw\.ssh\id_rsa" rootFolder="/srv/www/blue-twilight-dev" accessType="SFTP" keyPair="true">
+        <fileTransfer host="scar.andys.eu" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" rootFolder="/srv/www/blue-twilight-dev" accessType="SFTP" keyPair="true">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />
           </advancedOptions>
diff --git a/public/css/blue-twilight.css b/public/css/blue-twilight.css
index e73fe4e..b4e6c24 100644
--- a/public/css/blue-twilight.css
+++ b/public/css/blue-twilight.css
@@ -1,3 +1,6 @@
+.admin-sidebar-card {
+    margin-bottom: 15px;
+}
 html {
     font-size: 14px !important;
 }
diff --git a/public/css/blue-twilight.min.css b/public/css/blue-twilight.min.css
index 3607c6a..2007e1e 100644
--- a/public/css/blue-twilight.min.css
+++ b/public/css/blue-twilight.min.css
@@ -1,4 +1,4 @@
-html{font-size:14px !important}button,input,optgroup,select,textarea{cursor:pointer;font-family:inherit !important}.album-photo-cards .card{margin-bottom:15px}.container,.container-fluid{margin-top:20px}.tab-content{border:solid 1px #ddd;border-top:0;padding:20px}/*!
+.admin-sidebar-card{margin-bottom:15px}html{font-size:14px !important}button,input,optgroup,select,textarea{cursor:pointer;font-family:inherit !important}.album-photo-cards .card{margin-bottom:15px}.container,.container-fluid{margin-top:20px}.tab-content{border:solid 1px #ddd;border-top:0;padding:20px}/*!
  * Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com)
  * Copyright 2011-2017 The Bootstrap Authors
  * Copyright 2011-2017 Twitter, Inc.
diff --git a/resources/assets/css/admin.css b/resources/assets/css/admin.css
new file mode 100644
index 0000000..b9c1e07
--- /dev/null
+++ b/resources/assets/css/admin.css
@@ -0,0 +1,3 @@
+.admin-sidebar-card {
+    margin-bottom: 15px;
+}
\ No newline at end of file
diff --git a/resources/views/themes/base/admin/index.blade.php b/resources/views/themes/base/admin/index.blade.php
index b132cad..8056910 100644
--- a/resources/views/themes/base/admin/index.blade.php
+++ b/resources/views/themes/base/admin/index.blade.php
@@ -9,13 +9,13 @@
 @section('content')
     <div class="container">
         <div class="row">
-            <div class="col-sm-4 push-sm-8">
+            <div class="col-md-4 push-md-8">
                 @include (Theme::viewName('partials.admin_actions_widget'))
                 @include (Theme::viewName('partials.admin_manage_widget'))
                 @include (Theme::viewName('partials.admin_stats_widget'))
             </div>
 
-            <div class="col-sm-8 pull-sm-4">
+            <div class="col-md-8 pull-md-4">
                 @include (Theme::viewName('partials.admin_sysinfo_widget'))
             </div>
         </div>
diff --git a/resources/views/themes/base/gallery/album_empty.blade.php b/resources/views/themes/base/gallery/album_empty.blade.php
index 2789ecb..933c2d6 100644
--- a/resources/views/themes/base/gallery/album_empty.blade.php
+++ b/resources/views/themes/base/gallery/album_empty.blade.php
@@ -20,7 +20,7 @@
                 <p style="line-height: 1.6em;">@lang('gallery.album_no_results_text', ['admin_link' => sprintf('<a href="%s">%s</a>', route('admin'), trans('admin.title'))])</p>
                 <p style="margin-bottom: 30px; line-height: 1.6em;">@lang('gallery.album_no_results_text_2')</p>
 
-                <img src="{{ asset('themes/base/images/smartphone-photo.jpg') }}" class="img-responsive img-rounded" style="display: inline;" />
+                <img src="{{ asset('themes/base/images/smartphone-photo.jpg') }}" class="img-fluid rounded" style="display: inline;" />
             </div>
         </div>
     </div>
diff --git a/resources/views/themes/base/gallery/index.blade.php b/resources/views/themes/base/gallery/index.blade.php
index cf6b7e8..77c69ab 100644
--- a/resources/views/themes/base/gallery/index.blade.php
+++ b/resources/views/themes/base/gallery/index.blade.php
@@ -31,7 +31,7 @@
                 <h1>@lang('gallery.index_no_results_heading')</h1>
                 <p style="margin-bottom: 30px; line-height: 2em;">@lang('gallery.index_no_results_text', ['admin_link' => sprintf('<a href="%s">%s</a>', route('admin'), trans('admin.title'))])</p>
 
-                <img src="{{ asset('themes/base/images/take-a-photo.jpg') }}" class="img-responsive img-rounded" style="display: inline;" />
+                <img src="{{ asset('themes/base/images/take-a-photo.jpg') }}" class="img-fluid rounded" style="display: inline;" />
             </div>
         @endif
     </div>
diff --git a/resources/views/themes/base/partials/admin_actions_widget.blade.php b/resources/views/themes/base/partials/admin_actions_widget.blade.php
index 0acd65c..0bd766e 100644
--- a/resources/views/themes/base/partials/admin_actions_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_actions_widget.blade.php
@@ -1,8 +1,6 @@
-<div class="panel panel-default">
-    <div class="panel-heading">@lang('admin.actions_widget.panel_header')</div>
-    <div class="panel-body">
-        <ul class="nav nav-pills">
-            <li role="presentation"><a href="{{ route('albums.create') }}"><i class="fa fa-fw fa-plus"></i> @lang('admin.actions_widget.create_album_link')</a></li>
-        </ul>
+<div class="card admin-sidebar-card">
+    <div class="card-header">@lang('admin.actions_widget.panel_header')</div>
+    <div class="card-block">
+        <a class="btn btn-link" href="{{ route('albums.create') }}"><i class="fa fa-fw fa-plus"></i> @lang('admin.actions_widget.create_album_link')</a>
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/themes/base/partials/admin_manage_widget.blade.php b/resources/views/themes/base/partials/admin_manage_widget.blade.php
index a1492b4..1469758 100644
--- a/resources/views/themes/base/partials/admin_manage_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_manage_widget.blade.php
@@ -1,15 +1,13 @@
-<div class="panel panel-default">
-    <div class="panel-heading">@lang('admin.manage_widget.panel_header')</div>
-    <div class="panel-body">
-        <ul class="nav nav-pills">
-            <li role="presentation"><a href="{{ route('albums.index') }}"><i class="fa fa-fw fa-picture-o"></i> @lang('navigation.breadcrumb.albums')</a></li>
+<div class="card admin-sidebar-card">
+    <div class="card-header">@lang('admin.manage_widget.panel_header')</div>
+    <div class="card-block">
+        <a class="btn btn-link" href="{{ route('albums.index') }}"><i class="fa fa-fw fa-picture-o"></i> @lang('navigation.breadcrumb.albums')</a>
 
-            @can('admin-access')
-                <li role="presentation"><a href="{{ route('users.index') }}"><i class="fa fa-fw fa-user"></i> @lang('navigation.breadcrumb.users')</a></li>
-                <li role="presentation"><a href="{{ route('groups.index') }}"><i class="fa fa-fw fa-users"></i> @lang('navigation.breadcrumb.groups')</a></li>
-                <li role="presentation"><a href="{{ route('storage.index') }}"><i class="fa fa-fw fa-folder"></i> @lang('navigation.breadcrumb.storage')</a></li>
-                <li role="presentation"><a href="{{ route('admin.settings') }}"><i class="fa fa-fw fa-cog"></i> @lang('navigation.breadcrumb.settings')</a></li>
-            @endcan
-        </ul>
+        @can('admin-access')
+            <a class="btn btn-link" href="{{ route('users.index') }}"><i class="fa fa-fw fa-user"></i> @lang('navigation.breadcrumb.users')</a>
+            <a class="btn btn-link" href="{{ route('groups.index') }}"><i class="fa fa-fw fa-users"></i> @lang('navigation.breadcrumb.groups')</a>
+            <a class="btn btn-link" href="{{ route('storage.index') }}"><i class="fa fa-fw fa-folder"></i> @lang('navigation.breadcrumb.storage')</a>
+            <a class="btn btn-link" href="{{ route('admin.settings') }}"><i class="fa fa-fw fa-cog"></i> @lang('navigation.breadcrumb.settings')</a>
+        @endcan
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/themes/base/partials/admin_stats_widget.blade.php b/resources/views/themes/base/partials/admin_stats_widget.blade.php
index 74dc255..2209b70 100644
--- a/resources/views/themes/base/partials/admin_stats_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_stats_widget.blade.php
@@ -1,13 +1,11 @@
-<div class="panel panel-default">
-    <div class="panel-heading">@lang('admin.stats_widget.panel_header')</div>
-    <div class="panel-body">
-        <p>
-            <b>{{ $album_count }}</b> {{ trans_choice('admin.stats_widget.albums', $album_count) }}<br/>
-            <b>{{ $photo_count }}</b> {{ trans_choice('admin.stats_widget.photos', $photo_count) }}
-            @can('admin-access')
-                <br/>
-                <b>{{ $user_count }}</b> {{ trans_choice('admin.stats_widget.users', $user_count) }} / <b>{{ $group_count }}</b> {{ trans_choice('admin.stats_widget.groups', $group_count) }}
-            @endcan
-        </p>
+<div class="card admin-sidebar-card">
+    <div class="card-header">@lang('admin.stats_widget.panel_header')</div>
+    <div class="card-block">
+        <b>{{ $album_count }}</b> {{ trans_choice('admin.stats_widget.albums', $album_count) }}<br/>
+        <b>{{ $photo_count }}</b> {{ trans_choice('admin.stats_widget.photos', $photo_count) }}
+        @can('admin-access')
+            <br/>
+            <b>{{ $user_count }}</b> {{ trans_choice('admin.stats_widget.users', $user_count) }} / <b>{{ $group_count }}</b> {{ trans_choice('admin.stats_widget.groups', $group_count) }}
+        @endcan
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php b/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
index 167f473..e7c3565 100644
--- a/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
+++ b/resources/views/themes/base/partials/admin_sysinfo_widget.blade.php
@@ -1,7 +1,7 @@
-<div class="panel panel-default">
-    <div class="panel-heading">@lang('admin.sysinfo_panel')</div>
-    <div class="panel-body" style="padding: 0;">
-        <table id="system-info" class="table table-striped table-responsive" style="margin-bottom: 0; overflow-x: scroll;">
+<div class="card">
+    <div class="card-header">@lang('admin.sysinfo_panel')</div>
+    <div class="card-block" style="padding: 0;">
+        <table id="system-info" class="table my-0 table-striped">
             <tbody>
                 <tr>
                     <td class="meta-label">@lang('admin.sysinfo_widget.app_version')</td>