diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 5711b217e..9369f8165 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -1,5 +1,5 @@
 @import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700);
-/*
+/*!
  * Bootstrap v3.0.0
  *
  * Copyright 2013 Twitter, Inc
@@ -8,7 +8,7 @@
  *
  * Designed and built with all the love in the world by @mdo and @fat.
  */
-/* normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
 /* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
   display: block; }
@@ -5718,7 +5718,7 @@ th.visible-print, td.visible-print {
   /* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */
   th.hidden-print, td.hidden-print {
     display: none !important; } }
-/*
+/*!
  *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
@@ -7647,18 +7647,28 @@ html, body {
 #nobootstrap {
   float: left; }
 
-/* line 91, admin-theme.sass */
+/* line 90, admin-theme.sass */
+.data-focus.data-focus-primary {
+  background-color: #1ba6e5;
+  color: white;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  -ms-border-radius: 10px;
+  -o-border-radius: 10px;
+  border-radius: 10px; }
+
+/* line 98, admin-theme.sass */
 #customer_part .customerCard.selected-customer .panel, #customer_part .customerCard.selected-customer #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #customer_part .customerCard.selected-customer .notifs_panel, #customer_part .customerCard.selected-customer #dash_version {
   color: #5cb85c;
   border: solid 2px #5cb85c; }
 
-/* line 97, admin-theme.sass */
+/* line 104, admin-theme.sass */
 body.display-modal #content, body.display-modal #main {
   margin: 0;
   padding: 0;
   background: #f8f8f8; }
 
-/* line 107, admin-theme.sass */
+/* line 114, admin-theme.sass */
 *:focus {
   outline: none !important;
   -moz-outline: none !important;
@@ -8482,38 +8492,41 @@ select.input-tiny, input[type="text"].input-tiny, input[type="password"].input-t
 textarea {
   resize: none; }
 
-/* line 36, admin-theme/_admin-forms.sass */
+/* line 35, admin-theme/_admin-forms.sass */
 textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus {
   background-color: #fefbe2;
   -webkit-box-shadow: none;
   box-shadow: none; }
 
-/* line 41, admin-theme/_admin-forms.sass */
+/* line 40, admin-theme/_admin-forms.sass */
 .btn {
   text-transform: uppercase; }
-/* line 43, admin-theme/_admin-forms.sass */
+/* line 42, admin-theme/_admin-forms.sass */
 .btn .caret {
   border-top-color: #333333 !important; }
-/* line 46, admin-theme/_admin-forms.sass */
+/* line 45, admin-theme/_admin-forms.sass */
 .btn:hover .caret, .btn:focus .caret {
   border-top-color: white !important; }
-/* line 48, admin-theme/_admin-forms.sass */
+/* line 47, admin-theme/_admin-forms.sass */
 .btn.btn-default {
   -webkit-box-shadow: #e6e6e6 0 -2px 0 inset;
   box-shadow: #e6e6e6 0 -2px 0 inset; }
-/* line 50, admin-theme/_admin-forms.sass */
+/* line 49, admin-theme/_admin-forms.sass */
 .btn.btn-default:hover {
   -webkit-box-shadow: none;
   box-shadow: none;
   background-color: #1ba6e5;
   color: white;
   border-color: #1585b8; }
+/* line 54, admin-theme/_admin-forms.sass */
+.btn.btn-default:hover i {
+  color: white; }
 /* line 57, admin-theme/_admin-forms.sass */
 .btn.btn-primary {
   background-color: #1ba6e5;
   color: white;
   border-color: #1585b8; }
-/* line 63, admin-theme/_admin-forms.sass */
+/* line 62, admin-theme/_admin-forms.sass */
 .btn.btn-default[disabled] {
   border-color: #999999;
   color: #999999;
@@ -8521,46 +8534,46 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
   -webkit-box-shadow: #cccccc 0 -2px 0 inset;
   box-shadow: #cccccc 0 -2px 0 inset; }
 
-/* line 68, admin-theme/_admin-forms.sass */
+/* line 67, admin-theme/_admin-forms.sass */
 .dropdown-menu {
   text-align: left; }
 
-/* line 70, admin-theme/_admin-forms.sass */
+/* line 69, admin-theme/_admin-forms.sass */
 .btn-group-action {
   float: right; }
-/* line 72, admin-theme/_admin-forms.sass */
+/* line 71, admin-theme/_admin-forms.sass */
 .btn-group-action a {
   text-decoration: none; }
 
-/* line 76, admin-theme/_admin-forms.sass */
+/* line 75, admin-theme/_admin-forms.sass */
 .tt-query {
   border-bottom-right-radius: 3px !important;
   border-top-right-radius: 3px !important; }
 
-/* line 78, admin-theme/_admin-forms.sass */
+/* line 77, admin-theme/_admin-forms.sass */
 .tt-dropdown-menu {
   background-color: white;
   border: solid 1px #cccccc;
   font-size: 0.9em;
   text-transform: none; }
 
-/* line 83, admin-theme/_admin-forms.sass */
+/* line 82, admin-theme/_admin-forms.sass */
 .tt-suggestions {
   padding: 0 6px;
   -webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px;
   box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; }
 
-/* line 86, admin-theme/_admin-forms.sass */
+/* line 85, admin-theme/_admin-forms.sass */
 .tt-suggestion p {
   border-bottom: solid 1px #cccccc;
   margin: 0 !important;
   padding: 0 !important; }
 
-/* line 90, admin-theme/_admin-forms.sass */
+/* line 89, admin-theme/_admin-forms.sass */
 .tt-suggestion:last-child p {
   border-bottom: none; }
 
-/* line 94, admin-theme/_admin-forms.sass */
+/* line 93, admin-theme/_admin-forms.sass */
 .tagify-container {
   background-color: white;
   padding: 2px 6px;
@@ -8574,10 +8587,10 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
   border: solid 1px #cccccc;
   -webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset;
   box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; }
-/* line 102, admin-theme/_admin-forms.sass */
+/* line 101, admin-theme/_admin-forms.sass */
 .tagify-container span {
   float: left; }
-/* line 104, admin-theme/_admin-forms.sass */
+/* line 103, admin-theme/_admin-forms.sass */
 .tagify-container > span {
   display: inline-block;
   padding: 3px 5px;
@@ -8586,20 +8599,20 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
   border: 1px solid #1ba6e5;
   background-color: #60c1ed;
   color: white; }
-/* line 112, admin-theme/_admin-forms.sass */
+/* line 111, admin-theme/_admin-forms.sass */
 .tagify-container > span > a {
   padding-left: 5px;
   color: #1ba6e5;
   text-decoration: none;
   font-weight: bold; }
-/* line 117, admin-theme/_admin-forms.sass */
+/* line 116, admin-theme/_admin-forms.sass */
 .tagify-container > input {
   margin-top: 2px;
   border: 0 none;
   width: 100px;
   -webkit-box-shadow: none;
   box-shadow: none; }
-/* line 122, admin-theme/_admin-forms.sass */
+/* line 121, admin-theme/_admin-forms.sass */
 .tagify-container > input:focus {
   outline: 0;
   -webkit-box-shadow: none;
@@ -9323,7 +9336,8 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
     -webkit-box-shadow: #00a4e7 0 0 0 inset;
     box-shadow: #00a4e7 0 0 0 inset; } }
 
-/* Ladda
+/*!
+ * Ladda
  * http://lab.hakim.se/ladda
  * MIT licensed
  *
@@ -10132,134 +10146,133 @@ li.sortable-placeholder {
   -o-border-radius: 5px;
   border-radius: 5px; }
 
-/* line 3, admin-theme/_admin-dashboard.sass */
+/* line 2, admin-theme/_admin-dashboard.sass */
 .size_s, .size_md, .size_l, .size_xl, .size_xxl {
-  font-family: "Ubuntu", sans-serif;
-  color: #515561; }
+  font-family: "Ubuntu", sans-serif; }
 
-/* line 6, admin-theme/_admin-dashboard.sass */
+/* line 4, admin-theme/_admin-dashboard.sass */
 .size_s {
   font-size: 1.1em; }
 
-/* line 8, admin-theme/_admin-dashboard.sass */
+/* line 6, admin-theme/_admin-dashboard.sass */
 .size_md {
   font-size: 1.3em; }
 
-/* line 10, admin-theme/_admin-dashboard.sass */
+/* line 8, admin-theme/_admin-dashboard.sass */
 .size_l {
   font-size: 1.7em; }
 
-/* line 12, admin-theme/_admin-dashboard.sass */
+/* line 10, admin-theme/_admin-dashboard.sass */
 .size_xl {
   font-size: 2em; }
 
-/* line 14, admin-theme/_admin-dashboard.sass */
+/* line 12, admin-theme/_admin-dashboard.sass */
 .size_xxl {
   font-size: 2.3em; }
 
-/* line 16, admin-theme/_admin-dashboard.sass */
+/* line 15, admin-theme/_admin-dashboard.sass */
 .color_success {
   color: #5cb85c; }
 
-/* line 18, admin-theme/_admin-dashboard.sass */
+/* line 17, admin-theme/_admin-dashboard.sass */
 .color_danger {
   color: #d9534f; }
 
-/* line 21, admin-theme/_admin-dashboard.sass */
+/* line 20, admin-theme/_admin-dashboard.sass */
 .dash_trend_down {
   color: red; }
-/* line 23, admin-theme/_admin-dashboard.sass */
+/* line 22, admin-theme/_admin-dashboard.sass */
 .dash_trend_down:before {
   margin-right: 4px;
   font-family: FontAwesome;
   content: "\f0ab"; }
 
-/* line 27, admin-theme/_admin-dashboard.sass */
+/* line 26, admin-theme/_admin-dashboard.sass */
 .dash_trend_up {
   color: green; }
-/* line 29, admin-theme/_admin-dashboard.sass */
+/* line 28, admin-theme/_admin-dashboard.sass */
 .dash_trend_up:before {
   margin-right: 4px;
   font-family: FontAwesome;
   content: "\f0aa"; }
 
-/* line 33, admin-theme/_admin-dashboard.sass */
+/* line 32, admin-theme/_admin-dashboard.sass */
 .dash_trend_right {
   color: darkblue; }
-/* line 35, admin-theme/_admin-dashboard.sass */
+/* line 34, admin-theme/_admin-dashboard.sass */
 .dash_trend_right:before {
   margin-right: 4px;
   font-family: FontAwesome;
   content: "\f0a9"; }
 
-/* line 40, admin-theme/_admin-dashboard.sass */
+/* line 39, admin-theme/_admin-dashboard.sass */
 .box-stats {
   height: 70px; }
 
-/* line 45, admin-theme/_admin-dashboard.sass */
+/* line 44, admin-theme/_admin-dashboard.sass */
 #dashboard section header {
   padding: 3px 8px;
   margin: 0 0 3px 0;
   color: white;
   font-size: 1.2em;
   background-color: #1ba6e5; }
-/* line 51, admin-theme/_admin-dashboard.sass */
+/* line 50, admin-theme/_admin-dashboard.sass */
 #dashboard section header.panel-heading, #dashboard section #header_notifs_icon_wrapper .notifs_panel header.notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #dashboard section header.notifs_panel_header {
   color: #555555; }
-/* line 54, admin-theme/_admin-dashboard.sass */
+/* line 53, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list {
   margin: 0 0 10px 0;
   padding: 0; }
-/* line 58, admin-theme/_admin-dashboard.sass */
+/* line 57, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list li {
   position: relative; }
-/* line 63, admin-theme/_admin-dashboard.sass */
+/* line 62, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list .data_value {
   line-height: 39px;
   position: absolute;
   top: 0;
   right: 0;
   padding: 0 10px 0 0; }
-/* line 70, admin-theme/_admin-dashboard.sass */
+/* line 69, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_small {
   margin: 8px 0 10px 0;
   padding: 0 0 0 0;
   border-top: solid 1px #dddddd; }
-/* line 74, admin-theme/_admin-dashboard.sass */
+/* line 73, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_small li {
   padding: 3px 0;
   position: relative;
   border: none;
   margin: 0;
   border-bottom: dashed 1px #dddddd; }
-/* line 80, admin-theme/_admin-dashboard.sass */
+/* line 79, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_small .data_label {
   text-transform: uppercase;
   color: #bbbbbb; }
-/* line 83, admin-theme/_admin-dashboard.sass */
+/* line 82, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_small .data_value {
   line-height: 25px;
   position: absolute;
   top: 0;
   right: 0;
   padding: 0; }
-/* line 90, admin-theme/_admin-dashboard.sass */
+/* line 89, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_large {
   margin: 8px 0 10px 0;
   padding: 0; }
-/* line 94, admin-theme/_admin-dashboard.sass */
+/* line 93, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_large li {
   padding: 6px 0;
   position: relative;
   border: none;
   margin: 0; }
-/* line 99, admin-theme/_admin-dashboard.sass */
+/* line 98, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_large .data_label {
   line-height: 0.8em; }
-/* line 101, admin-theme/_admin-dashboard.sass */
+/* line 100, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_large .data_label small {
   font-size: 0.6em; }
-/* line 103, admin-theme/_admin-dashboard.sass */
+/* line 102, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_large .data_value {
   text-align: right;
   line-height: 0.6em;
@@ -10267,10 +10280,10 @@ li.sortable-placeholder {
   top: 0;
   right: 0;
   padding: 8px 0 0 0; }
-/* line 110, admin-theme/_admin-dashboard.sass */
+/* line 109, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_large .data_value small {
   font-size: 0.5em; }
-/* line 113, admin-theme/_admin-dashboard.sass */
+/* line 112, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_vertical {
   padding: 0;
   margin: 0 0 10px 0;
@@ -10280,30 +10293,30 @@ li.sortable-placeholder {
   -ms-border-radius: 3px;
   -o-border-radius: 3px;
   border-radius: 3px; }
-/* line 120, admin-theme/_admin-dashboard.sass */
+/* line 119, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_vertical li {
   border-left: solid 1px #dddddd;
   padding: 6px; }
-/* line 124, admin-theme/_admin-dashboard.sass */
+/* line 123, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_vertical li:first-child {
   border: none; }
-/* line 126, admin-theme/_admin-dashboard.sass */
+/* line 125, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_vertical .data_label {
   min-height: 32px;
   display: block;
   line-height: 1em;
   text-align: center; }
-/* line 131, admin-theme/_admin-dashboard.sass */
+/* line 130, admin-theme/_admin-dashboard.sass */
 #dashboard .data_list_vertical .data_value {
   display: block;
   text-align: center; }
-/* line 136, admin-theme/_admin-dashboard.sass */
+/* line 135, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends header {
   margin-bottom: 0; }
-/* line 138, admin-theme/_admin-dashboard.sass */
+/* line 137, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends #dashtrends_toolbar {
   margin: 4px -16px; }
-/* line 140, admin-theme/_admin-dashboard.sass */
+/* line 139, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends dl {
   cursor: pointer;
   margin: 0;
@@ -10313,25 +10326,25 @@ li.sortable-placeholder {
   padding: 10px;
   border-left: 1px solid #dddddd;
   border-bottom: 1px solid #dddddd; }
-/* line 149, admin-theme/_admin-dashboard.sass */
+/* line 148, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends dl:first-child {
   border-left: none; }
-/* line 151, admin-theme/_admin-dashboard.sass */
+/* line 150, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends dl.active {
   background-color: #eeeeee; }
-/* line 153, admin-theme/_admin-dashboard.sass */
+/* line 152, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends dt {
   text-align: center;
   height: 37px;
   line-height: 1em;
   font: 300 1.1em/120% "Ubuntu", sans-serif; }
-/* line 158, admin-theme/_admin-dashboard.sass */
+/* line 157, admin-theme/_admin-dashboard.sass */
 #dashboard #dashtrends svg {
   height: 350px; }
-/* line 162, admin-theme/_admin-dashboard.sass */
+/* line 161, admin-theme/_admin-dashboard.sass */
 #dashboard #dashgoals svg {
   height: 250px; }
-/* line 167, admin-theme/_admin-dashboard.sass */
+/* line 166, admin-theme/_admin-dashboard.sass */
 #dashboard #dashaddons {
   background-color: white;
   border: 1px dashed #dfdfdf;
@@ -10341,33 +10354,33 @@ li.sortable-placeholder {
   -o-border-radius: 3px;
   border-radius: 3px;
   padding: 10px 20px; }
-/* line 171, admin-theme/_admin-dashboard.sass */
+/* line 170, admin-theme/_admin-dashboard.sass */
 #dashboard #dashaddons a {
   display: block; }
-/* line 173, admin-theme/_admin-dashboard.sass */
+/* line 172, admin-theme/_admin-dashboard.sass */
 #dashboard #dashaddons a:hover {
   text-decoration: none; }
-/* line 178, admin-theme/_admin-dashboard.sass */
+/* line 177, admin-theme/_admin-dashboard.sass */
 #dashboard #dashactivity svg {
   height: 150px; }
-/* line 185, admin-theme/_admin-dashboard.sass */
+/* line 184, admin-theme/_admin-dashboard.sass */
 #dashboard .loading .data_value {
   min-width: 30px;
   text-align: center; }
-/* line 188, admin-theme/_admin-dashboard.sass */
+/* line 187, admin-theme/_admin-dashboard.sass */
 #dashboard .loading .data_value:before {
   font-size: 0.7em;
   font-family: FontAwesome;
   content: "\f021";
   color: #cccccc; }
-/* line 194, admin-theme/_admin-dashboard.sass */
+/* line 193, admin-theme/_admin-dashboard.sass */
 #dashboard .loading .data_value span, #dashboard .loading .data_value small {
   display: none; }
-/* line 196, admin-theme/_admin-dashboard.sass */
+/* line 195, admin-theme/_admin-dashboard.sass */
 #dashboard .loading .data_trend {
   display: none; }
 
-/* line 221, admin-theme/_admin-dashboard.sass */
+/* line 220, admin-theme/_admin-dashboard.sass */
 .data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
   opacity: 1;
   -webkit-animation-name: bounceG;
@@ -10381,7 +10394,7 @@ li.sortable-placeholder {
   transform: scale(0.7); }
 
 @-webkit-keyframes bounceG {
-  /* line 229, admin-theme/_admin-dashboard.sass */
+  /* line 228, admin-theme/_admin-dashboard.sass */
   0% {
     opacity: 0;
     filter: alpha(opacity=0);
@@ -10389,7 +10402,7 @@ li.sortable-placeholder {
     -ms-transform: scale(0.1);
     transform: scale(0.1); }
 
-  /* line 232, admin-theme/_admin-dashboard.sass */
+  /* line 231, admin-theme/_admin-dashboard.sass */
   100% {
     opacity: 1;
     filter: alpha(opacity=100);
@@ -10398,7 +10411,7 @@ li.sortable-placeholder {
     transform: scale(1); } }
 
 @-moz-keyframes bounceG {
-  /* line 229, admin-theme/_admin-dashboard.sass */
+  /* line 228, admin-theme/_admin-dashboard.sass */
   0% {
     opacity: 0;
     filter: alpha(opacity=0);
@@ -10406,7 +10419,7 @@ li.sortable-placeholder {
     -ms-transform: scale(0.1);
     transform: scale(0.1); }
 
-  /* line 232, admin-theme/_admin-dashboard.sass */
+  /* line 231, admin-theme/_admin-dashboard.sass */
   100% {
     opacity: 1;
     filter: alpha(opacity=100);
@@ -10415,7 +10428,7 @@ li.sortable-placeholder {
     transform: scale(1); } }
 
 @-ms-keyframes bounceG {
-  /* line 229, admin-theme/_admin-dashboard.sass */
+  /* line 228, admin-theme/_admin-dashboard.sass */
   0% {
     opacity: 0;
     filter: alpha(opacity=0);
@@ -10423,7 +10436,7 @@ li.sortable-placeholder {
     -ms-transform: scale(0.1);
     transform: scale(0.1); }
 
-  /* line 232, admin-theme/_admin-dashboard.sass */
+  /* line 231, admin-theme/_admin-dashboard.sass */
   100% {
     opacity: 1;
     filter: alpha(opacity=100);
@@ -10432,7 +10445,7 @@ li.sortable-placeholder {
     transform: scale(1); } }
 
 @-o-keyframes bounceG {
-  /* line 229, admin-theme/_admin-dashboard.sass */
+  /* line 228, admin-theme/_admin-dashboard.sass */
   0% {
     opacity: 0;
     filter: alpha(opacity=0);
@@ -10440,7 +10453,7 @@ li.sortable-placeholder {
     -ms-transform: scale(0.1);
     transform: scale(0.1); }
 
-  /* line 232, admin-theme/_admin-dashboard.sass */
+  /* line 231, admin-theme/_admin-dashboard.sass */
   100% {
     opacity: 1;
     filter: alpha(opacity=100);
@@ -10449,7 +10462,7 @@ li.sortable-placeholder {
     transform: scale(1); } }
 
 @keyframes bounceG {
-  /* line 229, admin-theme/_admin-dashboard.sass */
+  /* line 228, admin-theme/_admin-dashboard.sass */
   0% {
     opacity: 0;
     filter: alpha(opacity=0);
@@ -10457,7 +10470,7 @@ li.sortable-placeholder {
     -ms-transform: scale(0.1);
     transform: scale(0.1); }
 
-  /* line 232, admin-theme/_admin-dashboard.sass */
+  /* line 231, admin-theme/_admin-dashboard.sass */
   100% {
     opacity: 1;
     filter: alpha(opacity=100);
@@ -10465,11 +10478,11 @@ li.sortable-placeholder {
     -ms-transform: scale(1);
     transform: scale(1); } }
 
-/* line 236, admin-theme/_admin-dashboard.sass */
+/* line 235, admin-theme/_admin-dashboard.sass */
 #dash_version {
   padding: 0 !important;
   overflow: hidden; }
-/* line 240, admin-theme/_admin-dashboard.sass */
+/* line 239, admin-theme/_admin-dashboard.sass */
 #dash_version iframe {
   height: 80px;
   width: 100%; }
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index fb8b98beb..2117c7dcd 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -85,6 +85,13 @@ html, body
 #nobootstrap
 	float: left
 
+//data-focus
+.data-focus
+	&.data-focus-primary
+		background-color: $brand-primary
+		color: white
+		@include border-radius(10px)
+
 //orders
 #customer_part
 	.customerCard
diff --git a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
index f9538ca27..80bb68542 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
@@ -1,8 +1,6 @@
 //DASHBOARD
-
 .size_s, .size_md, .size_l, .size_xl, .size_xxl
 	font-family: $headings-font-family
-	color: $main-color
 .size_s
 	font-size: 1.1em
 .size_md
@@ -13,6 +11,7 @@
 	font-size: 2em
 .size_xxl
 	font-size: 2.3em
+
 .color_success
 	color: $brand-success
 .color_danger
diff --git a/admin-dev/themes/default/css/admin-theme/_admin-forms.sass b/admin-dev/themes/default/css/admin-theme/_admin-forms.sass
index 7d088e7f4..07c24d5eb 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-forms.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-forms.sass
@@ -32,7 +32,6 @@ input[type="password"].input-tiny
 textarea
 	resize: none
 
-
 textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus
 	background-color: #FEFBE2
 	@include box-shadow(none)
@@ -52,13 +51,13 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
 			background-color: $brand-primary
 			color: white
 			border-color: darken($brand-primary,10%)
-
+			i
+				color: white
 
 	&.btn-primary
 		background-color: $brand-primary
 		color: white
 		border-color: darken($brand-primary,10%)
-		//@include box-shadow(lighten($brand-success,30%) 0 -2px 0  inset)
 
 	&.btn-default[disabled]
 		border-color: $gray-light
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
index a75be0c4d..06286080f 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
@@ -17,22 +17,25 @@
 
 <div class="form-group">
 	<label class="control-label col-lg-3">{l s='Apply a discount'}</label>
-	<div class="input-group col-lg-8">
-		<span class="switch prestashop-switch switch-three">
-			<input type="radio" name="apply_discount" id="apply_discount_percent" value="percent" {if $currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval > 0}checked="checked"{/if} />
-			<label class="t radio" for="apply_discount_percent">
-				 <i class="icon-check-sign color_success"></i> {l s='Percent (%)'}
+	<div class="col-lg-9">
+		<div class="radio">
+			<label for="apply_discount_percent">
+				<input type="radio" name="apply_discount" id="apply_discount_percent" value="percent" {if $currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval > 0}checked="checked"{/if} />
+				{l s='Percent (%)'}
 			</label>
-			<input type="radio" name="apply_discount" id="apply_discount_amount" value="amount" {if $currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval > 0}checked="checked"{/if} />
-			<label class="t radio" for="apply_discount_amount">
-				 <i class="icon-check-sign color_success"></i> {l s='Amount'}
+		</div>
+		<div class="radio">
+			<label for="apply_discount_amount">
+				<input type="radio" name="apply_discount" id="apply_discount_amount" value="amount" {if $currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval > 0}checked="checked"{/if} />
+				{l s='Amount'}
 			</label>
-			<input type="radio" name="apply_discount" id="apply_discount_off" value="off" {if !$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval > 0 && !$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval > 0}checked="checked"{/if} />
-			<label class="t radio" for="apply_discount_off">
-				 <i class="icon-ban-circle color_danger"></i> {l s='None'}
+		</div>
+		<div class="radio">
+			<label for="apply_discount_off">
+				<input type="radio" name="apply_discount" id="apply_discount_off" value="off" {if !$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval > 0 && !$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval > 0}checked="checked"{/if} />
+				<i class="icon-ban-circle color_danger"></i> {l s='None'}
 			</label>
-			<span class="slide-button btn btn-default"></span>
-		</span>
+		</div>
 	</div>
 </div>
 
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 9ccb2cdcd..8ab4f50d6 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -85,24 +85,7 @@
 			if ($(this).val() != shipping_price_selected_carrier)
 				changed_shipping_price = true;
 		});
-		$('#show_old_carts').click(function() {
-			if ($('#old_carts_orders:visible').length == 0)
-			{
-				//$(this).html(txt_hide_carts);
-				$('#old_carts_orders').slideDown('slow');
-			}
-			else
-			{
-				//$(this).html(txt_show_carts);
-				$('#old_carts_orders').slideUp('slow');
-			}
-			return false;
-		});
-		$('#send_email_to_customer').click(function(){
-			sendMailToCustomer();
-			return false;
-		});
-		//$('#show_old_carts').click();
+
 		$('#payment_module_name').change();
 		$.ajaxSetup({ type:"post" });
 		$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')|addslashes}', {
@@ -156,10 +139,9 @@
 			useCart($(this).attr('rel'));
 			return false;
 		});
-		$('#free_shipping').click(function() {
-			var free_shipping = 0;
-			if (this.checked)
-				free_shipping = 1;
+
+		$('input:radio[name="free_shipping"]').on('change',function() {
+			var free_shipping = $('input[name=free_shipping]:checked').val();
 			$.ajax({
 				type:"POST",
 				url: "{$link->getAdminLink('AdminCarts')|addslashes}",
@@ -242,6 +224,17 @@
 		});
 		resetBind();
 
+		$('#customer').focus();
+
+		$('#submitAddProduct').on('click',function(){
+			addProduct();
+		});
+
+		$('#send_email_to_customer').on('click',function(){
+			sendMailToCustomer();
+			return false;
+		});
+
 		$('#products_found').hide();
 		$('#carts').hide();
 
@@ -260,11 +253,8 @@
 			$('#search-customer-form-group').show();
 			$(this).blur();
 		});
-
 	});
 
-	
-
 	function resetBind()
 	{
 		$('.fancybox').fancybox({
@@ -476,7 +466,7 @@
 						html += '<span class="text-muted">'+((this.birthday != '0000-00-00') ? this.birthday : '')+'</span><br/>';
 						html += '<div class="panel-footer">';
 						html += '<a href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1" class="btn btn-default fancybox"><i class="icon-search"></i> {l s='Details'}</a>';
-						html += '<button type="button" data-customer="'+this.id_customer+'" class="setup-customer btn btn-default pull-right"><i class="icon-ok"></i> {l s='Choose'}</button>';
+						html += '<button type="button" data-customer="'+this.id_customer+'" class="setup-customer btn btn-default pull-right"><i class="icon-arrow-right"></i> {l s='Choose'}</button>';
 						html += '</div>';
 						html += '</div>';
 						html += '</div>';
@@ -527,9 +517,9 @@
 						html_carts += '<td>'+this.id_cart+'</td>';
 						html_carts += '<td>'+this.date_add+'</td>';
 						html_carts += '<td>'+this.total_price+'</td>';
-						html_carts += '<td>';
-						html_carts += '<a title="{l s='View this cart'}" class="fancybox btn btn-default" href="index.php?tab=AdminCarts&id_cart='+this.id_cart+'&viewcart&token={getAdminToken tab='AdminCarts'}&liteDisplaying=1#"><i class="icon-search"></i></a>';
-						html_carts += '&nbsp;<a href="#" title="{l s='Use this cart'}" class="use_cart btn btn-default" rel="'+this.id_cart+'"><i class="icon-copy"></i></a>';
+						html_carts += '<td class="text-right">';
+						html_carts += '<a title="{l s='View this cart'}" class="fancybox btn btn-default" href="index.php?tab=AdminCarts&id_cart='+this.id_cart+'&viewcart&token={getAdminToken tab='AdminCarts'}&liteDisplaying=1#"><i class="icon-search"></i>&nbsp;{l s="Details"}</a>';
+						html_carts += '&nbsp;<a href="#" title="{l s='Use this cart'}" class="use_cart btn btn-default" rel="'+this.id_cart+'"><i class="icon-arrow-right"></i>&nbsp;{l s="Utiliser"}</a>';
 						html_carts += '</td>';
 						html_carts += '</tr>';
 					});
@@ -537,9 +527,9 @@
 					$.each(res.orders, function() {
 						html_orders += '<tr>';
 						html_orders += '<td>'+this.id_order+'</td><td>'+this.date_add+'</td><td>'+(this.nb_products ? this.nb_products : '0')+'</td><td>'+this.total_paid_real+'</span></td><td>'+this.payment+'</td><td>'+this.order_state+'</td>';
-						html_orders += '<td>';
-						html_orders += '<a href="{$link->getAdminLink('AdminOrders')}&id_order='+this.id_order+'&vieworder&liteDisplaying=1#" title="{l s='View this order'}" class="fancybox btn btn-default"><i class="icon-search"></i></a>';
-						html_orders += '&nbsp;<a href="#" "title="{l s='Duplicate this order'}" class="duplicate_order btn btn-default" rel="'+this.id_order+'"><i class="icon-copy"></i></a>';
+						html_orders += '<td class="text-right">';
+						html_orders += '<a href="{$link->getAdminLink('AdminOrders')}&id_order='+this.id_order+'&vieworder&liteDisplaying=1#" title="{l s='View this order'}" class="fancybox btn btn-default"><i class="icon-search"></i>&nbsp;{l s="Details"}</a>';
+						html_orders += '&nbsp;<a href="#" "title="{l s='Duplicate this order'}" class="duplicate_order btn btn-default" rel="'+this.id_order+'"><i class="icon-arrow-right"></i>&nbsp;{l s="Utiliser"}</a>';
 						html_orders += '</td>';
 						html_orders += '</tr>';
 					});
@@ -603,7 +593,7 @@
 				if(res.found)
 				{
 					if (!customization_errors)
-						$('#products_err').hide();
+						$('#products_err').addClass('hide');
 					else
 						customization_errors = false;
 					$('#products_found').show();
@@ -660,7 +650,7 @@
 				{
 					$('#products_found').hide();
 					$('#products_err').html('{l s='No products found'}');
-					$('#products_err').show();
+					$('#products_err').removeClass('hide');
 				}
 				resetBind();
 			}
@@ -699,10 +689,10 @@
 			var id_product = Number(this.id_product);
 			var id_product_attribute = Number(this.id_product_attribute);
 			cart_quantity[Number(this.id_product)+'_'+Number(this.id_product_attribute)+'_'+Number(this.id_customization)] = this.cart_quantity;
-			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="' + formatCurrency(parseFloat(this.price.replace(',', '.')), currency_format, currency_sign, currency_blank) + '" /></td><td>';
-			cart_content += (!this.id_customization ? '<div style="float:left;"><a href="#" class="increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><i class="icon-caret-up"></i></a><br /><a href="#" class="decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'"><i class="icon-caret-down"></i></a></div>' : '');
-			cart_content += (!this.id_customization ? '<div style="float:left;"><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" class="cart_quantity" size="2" value="'+this.cart_quantity+'" />' : '');
-			cart_content += (!this.id_customization ? '<a href="#" class="delete_product btn btn-default" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><i class="icon-remove text-danger"></i></a></div>' : '');
+			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="' + formatCurrency(parseFloat(this.price.replace(',', '.')), currency_format, currency_sign, currency_blank) + '" /></td><td>';
+			cart_content += (!this.id_customization ? '<div class="input-group fixed-width-md"><div class="input-group-btn"><a href="#" class="btn btn-default increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><i class="icon-caret-up"></i></a><a href="#" class="btn btn-default decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'"><i class="icon-caret-down"></i></a></div>' : '');
+			cart_content += (!this.id_customization ? '<input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" class="cart_quantity" value="'+this.cart_quantity+'" />' : '');
+			cart_content += (!this.id_customization ? '<div class="input-group-btn"><a href="#" class="delete_product btn btn-default" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><i class="icon-remove text-danger"></i></a></div></div>' : '');
 			cart_content += '</td><td>' + formatCurrency(parseFloat(this.total.replace(',', '.')), currency_format, currency_sign, currency_blank) + '</td></tr>';
 			
 			if (this.id_customization && this.id_customization != 0)
@@ -724,10 +714,10 @@
 						});
 					}
 			cart_content += '<tr><td></td><td>'+customized_desc+'</td><td></td><td></td><td>';
-			cart_content += '<div style="float:left;"><a href="#" class="increaseqty_product" rel="'+id_product+'_'+id_product_attribute+'_'+id_customization+'" ><i class="icon-caret-up"></i></a><br /><a href="#" class="decreaseqty_product" rel="'+id_product+'_'+id_product_attribute+'_'+id_customization+'"><i class="icon-caret-down"></i></a></div>';
-			cart_content += '<div style="float:left;"><input type="text" rel="'+id_product+'_'+id_product_attribute+'_'+id_customization +'" class="cart_quantity" size="2" value="'+this.quantity+'" />';
-			cart_content += '<a href="#" class="delete_product btn btn-default" rel="delete_'+id_product+'_'+id_product_attribute+'_'+id_customization+'" ><i class="icon-remove"></i></a>';
-			cart_content += '</div></td><td></td></tr>';
+			cart_content += '<div class="input-group fixed-width-md"><a href="#" class="btn btn-default increaseqty_product" rel="'+id_product+'_'+id_product_attribute+'_'+id_customization+'" ><i class="icon-caret-up"></i></a><br /><a href="#" class="btn btn-default decreaseqty_product" rel="'+id_product+'_'+id_product_attribute+'_'+id_customization+'"><i class="icon-caret-down"></i></a></div>';
+			cart_content += '<input type="text" rel="'+id_product+'_'+id_product_attribute+'_'+id_customization +'" class="cart_quantity" value="'+this.quantity+'" />';
+			cart_content += '<div class="input-group-btn"><a href="#" class="delete_product btn btn-default" rel="delete_'+id_product+'_'+id_product_attribute+'_'+id_customization+'" ><i class="icon-remove"></i></a>';
+			cart_content += '</div></div></td><td></td></tr>';
 				});
 			}
 		});
@@ -744,7 +734,7 @@
 		var vouchers_html = '';
 		if (typeof(vouchers) == 'object')
 			$.each(vouchers, function(){
-				vouchers_html += '<tr><td>'+this.name+'</td><td>'+this.description+'</td><td>'+this.value_real+'</td><td><a href="#" class="btn btn-default delete_discount" rel="'+this.id_discount+'"><i class="icon-remove"></i></a> {l s='Delete'}</td></tr>';
+				vouchers_html += '<tr><td>'+this.name+'</td><td>'+this.description+'</td><td>'+this.value_real+'</td><td class="text-right"><a href="#" class="btn btn-default delete_discount" rel="'+this.id_discount+'"><i class="icon-remove text-danger"></i>&nbsp;{l s='Delete'}</a></td></tr>';
 			});
 		$('#voucher_list tbody').html($.trim(vouchers_html));
 		if ($('#voucher_list tbody').html().length == 0)
@@ -787,7 +777,7 @@
 		if (jsonSummary.free_shipping == 1)
 			$('#free_shipping').attr('checked', true);
 		else
-			$('#free_shipping').removeAttr('checked');
+			$('#free_shipping_off').attr('checked', true);
 
 		$('#gift_message').html(jsonSummary.cart.gift_message);
 		if (!changed_shipping_price)
@@ -840,10 +830,10 @@
 					$.each(res.errors, function() {
 						errors += this + '<br />';
 					});
-					$('#products_err').show();
+					$('#products_err').removeClass('hide');
 				}
 				else
-					$('#products_err').hide();
+					$('#products_err').addClass('hide');
 				$('#products_err').html(errors);
 			}
 		});
@@ -860,10 +850,10 @@
 		var id_product = $('#id_product option:selected').val();
 		$('#products_found #customization_list').contents().find('#customization_'+id_product).submit();
 		if (customization_errors)
-			$('#products_err').show();
+			$('#products_err').removeClass('hide');
 		else
 		{
-			$('#products_err').hide();
+			$('#products_err').addClass('hide');
 			updateQty(id_product, $('#ipa_'+id_product+' option:selected').val(), 0, $('#qty').val());
 		}
 	}
@@ -958,9 +948,9 @@
 			success : function(res)
 			{
 				if (res.errors)
-					$('#send_email_feedback').removeClass('conf').addClass('error');
+					$('#send_email_feedback').removeClass('hide').removeClass('alert-success').addClass('alert-danger');
 				else
-					$('#send_email_feedback').removeClass('error').addClass('conf');
+					$('#send_email_feedback').removeClass('hide').removeClass('alert-danger').addClass('alert-success');
 				$('#send_email_feedback').html(res.result);
 			}
 		});
@@ -1049,14 +1039,15 @@
 
 <div class="leadin">{block name="leadin"}{/block}</div>
 
-<form action="" method="" class="form-horizontal">
-	<div class="panel" id="customer_part">
+
+	<div class="panel form-horizontal" id="customer_part">
+
 		<h3>
 			<i class="icon-user"></i>
 			{l s='Customer'}
 		</h3>
 
-		<div id="search-customer-form-group" class="form-group">
+		<div id="search-customer-form-group" class="form-group ">
 			<label class="control-label col-lg-3">
 				<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a customer by typping the first letters of his/her name'}">
 					{l s='Search customers'}
@@ -1088,37 +1079,26 @@
 		</div>
 
 		<div id="carts">
-			<!-- <a href="#" id="show_old_carts" class="btn btn-default"><i class="icon-carret-down"></i>&nbsp;{l s='Carts and Orders'}</a> -->
+			<button type="button" id="show_old_carts" class="btn btn-default pull-right" data-toggle="collapse" data-target="#old_carts_orders">
+				<i class="icon-caret-down"></i>
+			</button>
+
 			<ul id="old_carts_orders_navtab" class="nav nav-tabs">
 				<li class="active">
-					<a href="#nonOrderedCarts" data-toggle="tab">
-						<i class="icon-shopping-cart"></i>
-						{l s='Carts'}
-					</a>
-				</li>
-				<li>
 					<a href="#lastOrders" data-toggle="tab">
 						<i class="icon-credit-card"></i>
 						{l s='Orders'}
 					</a>
 				</li>
+				<li>
+					<a href="#nonOrderedCarts" data-toggle="tab">
+						<i class="icon-shopping-cart"></i>
+						{l s='Carts'}
+					</a>
+				</li>
 			</ul>
-			<div id="old_carts_orders" class="tab-content panel">
-				<div id="nonOrderedCarts" class="tab-pane active">
-					<table class="table">
-						<thead>
-							<tr>
-								<th><span class="title_box">{l s='ID'}</span></th>
-								<th><span class="title_box">{l s='Date'}</span></th>
-								<th><span class="title_box">{l s='Total'}</span></th>
-								<th></th>
-							</tr>
-						</thead>
-						<tbody>
-						</tbody>
-					</table>
-				</div>
-				<div id="lastOrders" class="tab-pane">
+			<div id="old_carts_orders" class="tab-content panel collapse in">
+				<div id="lastOrders" class="tab-pane active">
 					<table class="table">
 						<thead>
 							<tr>
@@ -1135,10 +1115,24 @@
 						</tbody>
 					</table>
 				</div>
+				<div id="nonOrderedCarts" class="tab-pane">
+					<table class="table">
+						<thead>
+							<tr>
+								<th><span class="title_box">{l s='ID'}</span></th>
+								<th><span class="title_box">{l s='Date'}</span></th>
+								<th><span class="title_box">{l s='Total'}</span></th>
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+						</tbody>
+					</table>
+				</div>
 			</div>
 		</div>
 	</div>
-</form>
+
 
 <form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
 	<div class="panel" id="products_part" style="display:none;">
@@ -1195,12 +1189,14 @@
 
 			<div class="form-group">
 				<div class="col-lg-9 col-lg-offset-3">
-					<input type="submit" onclick="addProduct();return false;" class="btn btn-default" id="submitAddProduct" value="{l s='Add to cart'}"/>
+					<button type="button" class="btn btn-default" id="submitAddProduct" />
+					<i class="icon-ok text-success"></i>
+					{l s='Add to cart'}
 				</div>
 			</div>
 		</div>
 
-		<div id="products_err" class="alert alert-warning" style="display:none;"></div>
+		<div id="products_err" class="hide alert alert-danger"></div>
 		
 		<hr/>
 
@@ -1319,7 +1315,9 @@
 					<i class="icon-truck"></i>
 					{l s='Delivery'}
 				</h4>
-				<select id="id_address_delivery" name="id_address_delivery"></select>
+				<div class="row-margin-bottom">
+					<select id="id_address_delivery" name="id_address_delivery"></select>
+				</div>
 				<div class="well">
 					<div id="address_delivery_detail"></div>
 				</div>
@@ -1329,7 +1327,9 @@
 					<i class="icon-file-text"></i>
 					{l s='Invoice'}
 				</h4>
-				<select id="id_address_invoice" name="id_address_invoice"></select>
+				<div class="row-margin-bottom">
+					<select id="id_address_invoice" name="id_address_invoice"></select>
+				</div>
 				<div class="well">
 					<div id="address_invoice_detail"></div>
 				</div>
@@ -1355,7 +1355,7 @@
 				<label class="control-label col-lg-3">
 					{l s='Delivery option'} 
 				</label>
-				<div class="col-lg-6">
+				<div class="col-lg-9">
 					<select name="delivery_option" id="delivery_option">
 					</select>
 				</div>
@@ -1364,18 +1364,28 @@
 				<label class="control-label col-lg-3" for="shipping_price">
 					{l s='Shipping price:'}
 				</label>
-				<div class="col-lg-6">
-					<span id="shipping_price" class="form-static-control" name="shipping_price"></span>
+				<div class="col-lg-9">
+					<p id="shipping_price" class="form-control-static" name="shipping_price"></p>
 				</div>
 			</div>
 			<div class="form-group">
 				<label class="control-label col-lg-3" for="free_shipping">
 					{l s='Free shipping'}
 				</label>
-				<div class="col-lg-6">
-					<div class="checkbox">
-						<input type="checkbox" id="free_shipping" name="free_shipping" value="1" />
-					</div>
+				<div class="input-group col-lg-3">
+					<span class="switch prestashop-switch">
+						<input type="radio" name="free_shipping" id="free_shipping" value="1">
+						<label for="free_shipping" class="radioCheck">
+							<i class="icon-check-sign text-success"></i>
+							{l s='yes'}
+						</label>
+						<input type="radio" name="free_shipping" id="free_shipping_off" value="0" checked="checked">
+						<label for="free_shipping_off" class="radioCheck">
+							<i class="icon-ban-circle text-danger"></i>
+							{l s='No'}
+						</label>
+						<span class="slide-button btn btn-default"></span>
+					</span>
 				</div>
 			</div>
 
@@ -1414,33 +1424,45 @@
 			{l s='Summary'}
 		</h3>
 
-		<div id="send_email_feedback" class="alert alert-warning"></div>
+		<div id="send_email_feedback" class="hide alert"></div>
 
 		<div id="cart_summary" class="panel row-margin-bottom text-center">
 			<div class="row">
 				<div class="col-lg-2">
-					<span>{l s='Total products:'}</span><br/>
-					<span id="total_products" class="size_l"></span>
+					<div class="data-focus">
+						<span>{l s='Total products:'}</span><br/>
+						<span id="total_products" class="size_l text-success"></span>
+					</div>
 				</div>
 				<div class="col-lg-2">
-					<span>{l s='Total vouchers:'}</span><br/>
-					<span id="total_vouchers" class="size_l"></span>
+					<div class="data-focus">
+						<span>{l s='Total vouchers:'}</span><br/>
+						<span id="total_vouchers" class="size_l text-danger"></span>
+					</div>
 				</div>
 				<div class="col-lg-2">
-					<span>{l s='Total shipping:'}</span><br/>
-					<span id="total_shipping" class="size_l"></span>
+					<div class="data-focus">
+						<span>{l s='Total shipping:'}</span><br/>
+						<span id="total_shipping" class="size_l"></span>
+					</div>
 				</div>
 				<div class="col-lg-2">
-					<span>{l s='Total taxes:'}</span><br/>
-					<span id="total_taxes" class="size_l"></span>
+					<div class="data-focus">
+						<span>{l s='Total taxes:'}</span><br/>
+						<span id="total_taxes" class="size_l"></span>
+					</div>
 				</div>
 				<div class="col-lg-2">
-					<span>{l s='Total without taxes:'}</span><br/>
-					<span id="total_without_taxes" class="size_l"></span>
+					<div class="data-focus">
+						<span>{l s='Total without taxes:'}</span><br/>
+						<span id="total_without_taxes" class="size_l"></span>
+					</div>
 				</div>
 				<div class="col-lg-2">
-					<span>{l s='Total with taxes'}</span><br/>
-					<span id="total_with_taxes" class="size_l"></span>
+					<div class="data-focus data-focus-primary">
+						<span>{l s='Total with taxes'}</span><br/>
+						<span id="total_with_taxes" class="size_l"></span>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -1456,7 +1478,7 @@
 
 				<div class="form-group">
 					<div class="col-lg-9 col-lg-offset-3">
-						<a href="#" id="send_email_to_customer" class="btn btn-default">
+						<a href="javascript:void(0);" id="send_email_to_customer" class="btn btn-default">
 							<i class="icon-credit-card"></i>
 							{l s='Send an email to the customer with the link to process the payment.'}
 						</a>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 745f3f55b..a6c692e16 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -147,6 +147,9 @@ class AdminOrdersControllerCore extends AdminController
 				'desc' => $this->l('Add new order'),
 				'icon' => 'process-icon-new'
 			);
+		
+		if ($this->display == 'add')
+		unset($this->page_header_toolbar_btn['save']);
 
 		if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && isset($this->page_header_toolbar_btn['new_order'])
 			&& Shop::isFeatureActive())