diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css
index bf81b8d..353393c 100644
--- a/admin/themes/default/css/default.css
+++ b/admin/themes/default/css/default.css
@@ -107,7 +107,7 @@ footer span {
 
 /* Admin Form */
 .form-signin  {
-    width: 400px;
+    max-width: 400px;
 }
 
 .form-signin {
@@ -553,4 +553,8 @@ td, th {
     .dashboard-well .col-xs-6 .pull-right {
         float: left!important;
     }    
+
+    .system-buttons .btn {
+        width: 100%;
+    }
 }
\ No newline at end of file
diff --git a/plugins/box/system/views/backend/index.view.php b/plugins/box/system/views/backend/index.view.php
index b6d3ad0..571ad86 100755
--- a/plugins/box/system/views/backend/index.view.php
+++ b/plugins/box/system/views/backend/index.view.php
@@ -1,3 +1,4 @@
+<div class="system-buttons">
 <?php echo Html::anchor(__('Create Sitemap', 'system'), 'index.php?id=system&sitemap=create&token='.Security::token(), array('class' => 'btn btn-default')).Html::nbsp(2); ?>
 <?php echo Html::anchor(__('Delete Temporary Files', 'system'), 'index.php?id=system&temporary_files=delete&token='.Security::token(), array('class' => 'btn btn-default')).Html::nbsp(2); ?>
 <?php if ('off' == Option::get('maintenance_status', 'system')) { ?>
@@ -6,6 +7,7 @@
 <?php echo Html::anchor(__('Maintenance Mode Off', 'system'), 'index.php?id=system&maintenance=off&token='.Security::token(), array('class' => 'btn btn-danger')); ?>
 <?php } ?>
 <?php Action::run('admin_system_extra_buttons'); ?>
+</div>
 
 <hr>
 
diff --git a/public/assets/css/messenger.css b/public/assets/css/messenger.css
index caa9e3c..b41c451 100644
--- a/public/assets/css/messenger.css
+++ b/public/assets/css/messenger.css
@@ -89,7 +89,7 @@ ul.messenger.messenger-fixed.messenger-on-top.messenger-on-left, ul.messenger.me
 }
 /* line 72, ../../src/sass/messenger.sass */
 ul.messenger.messenger-fixed.messenger-on-right, ul.messenger.messenger-fixed.messenger-on-left {
-  width: 420px;
+  max-width: 420px;
 }
 /* line 75, ../../src/sass/messenger.sass */
 ul.messenger.messenger-fixed.messenger-on-right .messenger-actions, ul.messenger.messenger-fixed.messenger-on-left .messenger-actions {