diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css
index 3c989fcb..83994683 100644
--- a/kfet/static/kfet/css/kpsul.css
+++ b/kfet/static/kfet/css/kpsul.css
@@ -28,18 +28,13 @@ input[type=number]::-webkit-outer-spin-button {
 /* Account */
 
 #account {
-    border:1px solid #fff;
     color:black;
     height:120px;
 }
 
-#account[data-balance="ok"] { border-color:#009011; }
 #account[data-balance="ok"] #account_form input { background:#009011; color:#FFF;}
-#account[data-balance="low"] { border-color:#EC6400; }
 #account[data-balance="low"] #account_form input { background:#EC6400; color:#FFF; }
-#account[data-balance="neg"] { border-color:#C8102E; }
 #account[data-balance="neg"] #account_form input { background:#C8102E; color:#FFF; }
-#account[data-balance="frozen"] { border-color:#000FBA; }
 #account[data-balance="frozen"] #account_form input { background:#000FBA; color:#FFF; }
 
 #account_form {
@@ -95,17 +90,17 @@ input[type=number]::-webkit-outer-spin-button {
 
     @media (min-width: 768px) {
         #account{ height:160px; }
-    #account_form input { font-size: 70px; }
-    #account_name { font-size:60px; }
-    #account_data .data_line {
-        font-size:14px;
-        line-height:24px;
-    }
-    #account_data #account-balance {
-        font-size:50px;
-        line-height:60px;
-        height:60px;
-    }
+        #account_form input { font-size: 70px; }
+        #account_name { font-size:60px; }
+        #account_data .data_line {
+            font-size:14px;
+            line-height:24px;
+        }
+        #account_data #account-balance {
+            font-size:50px;
+            line-height:60px;
+            height:60px;
+        }
 
         #account { margin-right:0; }
         #account_form input { font-size:85px; }
@@ -119,7 +114,6 @@ input[type=number]::-webkit-outer-spin-button {
 /* Checkout */
 
 #checkout {
-    border:1px solid #c8102e;
     padding:0;
     height:160px;
     font-family:'Roboto Mono';
@@ -233,17 +227,16 @@ input[type=number]::-webkit-outer-spin-button {
 #article_selection input {
     height:100%;
     float:left;
-    border-left:1px solid #c8102e;
+    border:0;
     border-right:1px solid #c8102e;
+    border-bottom:1px solid #c8102e;
     border-radius:0;
-    border-top:0;
-    border-bottom:0;
     font-size:16px;
     font-weight:bold;
 }
 
 #article_selection input+input {
-    border-left:0;
+    border-right:0;
 }
 
 #article_autocomplete {
@@ -269,8 +262,6 @@ input[type=number]::-webkit-outer-spin-button {
 /* Article data */
 
 #articles_data {
-    border:1px solid #c8102e;
-
     overflow:auto;
     max-height:500px;
 }
@@ -304,7 +295,6 @@ input[type=number]::-webkit-outer-spin-button {
 
 .kpsul_middle_left_bottom {
     margin:15px 0 0;
-    border:1px solid #c8102e;
 }
 
 .kpsul_middle_left_bottom > div {
@@ -312,19 +302,20 @@ input[type=number]::-webkit-outer-spin-button {
     padding:0;
 }
 
+#basket, #basket_rel {
+    height:100%;
+}
+
 #basket {
     overflow:auto;
 }
 
-#basket_rel {
-    border-top:1px solid #c8102e;
-    border-left:0;
-}
-
 @media (min-width:768px) {
+    #basket {
+        margin-right:7px;
+    }
     #basket_rel {
-        border-left:1px solid #c8102e;
-        border-top:0;
+        margin-left:7px;
     }
 }
 
@@ -356,10 +347,8 @@ input[type=number]::-webkit-outer-spin-button {
 
 /* History */
 
-#history {
+.kpsul_middle_right_col {
     overflow:auto;
-    height:100%;
-    border:1px solid #c8102e;
 }
 
 #history .day {
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index e044e415..bb77f2d0 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -78,11 +78,15 @@
         </div>
       </div>
       <div class="row kpsul_middle_left_bottom">
-        <div class="col-sm-6" id="basket">
-          <table id="basket_table">
-          </table>
+        <div class="col-sm-6">
+          <div id="basket">
+            <table id="basket_table">
+            </table>
+          </div>
         </div>
-        <div class="col-sm-6" id="basket_rel">
+        <div class="col-sm-6">
+          <div id="basket_rel">
+          </div>
         </div>
       </div>
     </div>