diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index b3cffe8b..da99dd1e 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -34,7 +34,7 @@
     });
 </script>
 
-<div id="settings-page" class="row-fluid">
+<div id="settings-page" class="container-fluid">
     <ul class="nav nav-tabs">
         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
             <li role="representation" class="general-tab tab"><a><?php echo $this->lang->line('general'); ?></a></li>
@@ -174,7 +174,7 @@
                     <?php endif ?>
                 </legend>
 
-                <div class="row-fluid">
+                <div class="row">
                     <div class="col-md-7 working-plan-wrapper">
                         <h4><?php echo $this->lang->line('working_plan'); ?></h4>
                         <span class="help-block">
@@ -331,8 +331,8 @@
     ?>
     <?php $hidden = ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
     <div id="user" class="tab-content <?php echo $hidden; ?>">
-        <form>
-            <fieldset class="col-md-5 personal-info-wrapper">
+        <form class="row">
+            <fieldset class="col-xs-12 col-sm-6 personal-info-wrapper">
                 <legend>
                     <?php echo $this->lang->line('personal_information'); ?>
                     <?php if ($privileges[PRIV_USER_SETTINGS]['edit'] == TRUE): ?>
@@ -397,7 +397,7 @@
                 </div>
             </fieldset>
 
-            <fieldset class="col-md-5 miscellaneous-wrapper">
+            <fieldset class="col-xs-12 col-sm-6 miscellaneous-wrapper">
                 <legend><?php echo $this->lang->line('system_login'); ?></legend>
 
                 <div class="form-group">
diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css
index bda14764..a8d3b1c8 100644
--- a/src/assets/css/backend.css
+++ b/src/assets/css/backend.css
@@ -680,14 +680,12 @@ body .form-horizontal .controls {
 }
 
 #settings-page .tab-content {
-    margin: 15px;
     overflow: auto;
 }
 
 #settings-page .nav {
-    margin: 15px;
     background-color: #F4F4F4;
-    border-radius: 4px;
+    margin-bottom: 15px;
 }
 
 #settings-page .nav li {
@@ -697,7 +695,7 @@ body .form-horizontal .controls {
 #business-logic .working-plan td input[type="text"] {
     margin-bottom: 0;
     cursor: pointer;
-    width: 85px;
+    width: 55px;
 }
 
 #business-logic .working-plan label.checkbox {
@@ -727,6 +725,7 @@ body .form-horizontal .controls {
 #business-logic #book-advance-timeout {
     margin: 0 0 0 10px;
     width: 50px;
+    color: #666;
 }
 
 #business-logic .ui-spinner {
@@ -760,11 +759,12 @@ body .form-horizontal .controls {
 
 #settings-page .personal-info-wrapper {
     max-width: 400px;
-    padding-left: 0;
+    margin-bottom: 20px;
 }
 
 #settings-page .miscellaneous-wrapper {
     max-width:  400px;
+    margin-bottom: 20px;
 }
 
 #settings-page #about {