diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 95285ac79..078eb4df4 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h2>{{$header}}</h2>
 
 <h3>{{$addr}}</h3>
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index b1838ece1..2ab3edcc2 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -10,6 +10,7 @@
 		});
 	});
 </script>
+<div class="widget">
 <h3>{{$admtxt}}</h3>
 <ul class="nav nav-pills nav-stacked">
 	<li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
@@ -20,6 +21,7 @@
 	<li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li>
 	<li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
 </ul>
+</div>
 
 {{if $admin.update}}
 <ul class="nav nav-pills nav-stacked">
@@ -29,16 +31,20 @@
 {{/if}}
 
 
-{{if $admin.plugins_admin}}<h3>{{$plugadmtxt}}</h3>{{/if}}
+{{if $admin.plugins_admin}}
+<div class="widget">
+<h3>{{$plugadmtxt}}</h3>
 <ul class="nav nav-pills nav-stacked">
 	{{foreach $admin.plugins_admin as $l}}
 	<li><a href='{{$l.0}}'>{{$l.1}}</a></li>
 	{{/foreach}}
 </ul>
+</div>
+{{/if}}
 	
-	
+<div class="widget">	
 <h3>{{$logtxt}}</h3>
 <ul class="nav nav-pills nav-stacked">
 	<li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
 </ul>
-
+</div>
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index b26e67687..817eb939a 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -10,7 +10,7 @@
 		return false;
 	}
 </script>
-<div class = "generic-content-wrapper" id='adminpage'>
+<div class = "generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/channels" method="post">
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
index 06a8cdf6a..1bd1f0122 100755
--- a/view/tpl/admin_hubloc.tpl
+++ b/view/tpl/admin_hubloc.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper" id='adminpage'>
+<div class="generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<table id='server'>
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 3d2adc660..6d2d7834c 100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper" id='adminpage'>
+<div class="generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/logs" method="post">
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index 40821c534..0f76cc4fe 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper" id='adminpage'>
+<div class="generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 		<ul id='pluginslist'>
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 1c1a59879..bdcc82c08 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,4 +1,4 @@
-<div class = "generic-content-wrapper" id='adminpage'>
+<div class = "generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 56485dff6..8c62cb80f 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -34,7 +34,7 @@
 		});
 	});
 </script>
-<div id="adminpage" class="generic-content-wrapper">
+<div id="adminpage" class="generic-content-wrapper-styled">
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/site" method="post">
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index 24cdd57cc..7f752a773 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper" id='adminpage'>
+<div class="generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<dl>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 65fffd17c..5bf64b4df 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -10,7 +10,7 @@
 		return false;
 	}
 </script>
-<div class = "generic-content-wrapper" id='adminpage'>
+<div class = "generic-content-wrapper-styled" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/users" method="post">
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
index 68c0bcdf2..f53f1f478 100755
--- a/view/tpl/failed_updates.tpl
+++ b/view/tpl/failed_updates.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$banner}}</h2>
 
 <div id="failed_updates_desc">{{$desc}}</div>
@@ -14,4 +15,4 @@
 <hr />
 {{/foreach}}
 {{/if}}
-
+</div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 1340a1653..07a37f773 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index 1e28d8b84..36bb494d8 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index 3e447cd0a..f0d5195bf 100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
index a8bde4c1e..8bea9ca63 100755
--- a/view/tpl/settings_connectors.tpl
+++ b/view/tpl/settings_connectors.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <form action="settings/connectors" method="post" autocomplete="off">
@@ -6,4 +7,4 @@
 {{$settings_connectors}}
 
 </form>
-
+</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index f10f2e1c2..d3134ea88 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$ptitle}}</h1>
 
 <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index a03817f82..3291162fa 100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index 9be0035ff..f7b4a0b1a 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>