diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 3db0f189a..b6553f1ee 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -7801,7 +7801,7 @@ a.link-social:hover {
 
 /* line 1, admin-theme/_admin-nav.sass */
 #nav-sidebar {
-  float: left;
+  position: fixed;
   width: 240px;
   height: 100% !important;
   overflow-y: auto;
@@ -7845,33 +7845,33 @@ a.link-social:hover {
 #nav-sidebar ul.menu li.maintab.active a.title i, #nav-sidebar ul.menu li.maintab.active a.title:hover i {
   color: black;
   background-color: white; }
-/* line 40, admin-theme/_admin-nav.sass */
+/* line 39, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.active a.title:hover {
   color: white; }
-/* line 43, admin-theme/_admin-nav.sass */
+/* line 42, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.expanded a.title {
   color: white;
   background-color: #3a3d45;
   border-bottom: solid 1px #17181c; }
-/* line 47, admin-theme/_admin-nav.sass */
+/* line 46, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.expanded a.title:hover {
   background-color: #686d7d; }
-/* line 49, admin-theme/_admin-nav.sass */
+/* line 48, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.expanded a.title i {
   color: white; }
-/* line 53, admin-theme/_admin-nav.sass */
+/* line 52, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.expanded ul.submenu {
   display: block; }
-/* line 55, admin-theme/_admin-nav.sass */
+/* line 54, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.expanded ul.submenu a {
   color: #9da1ae;
   background-color: #2e3037;
   border-bottom: solid 1px #17181c; }
-/* line 59, admin-theme/_admin-nav.sass */
+/* line 58, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab.expanded ul.submenu a:hover {
   color: white;
   background-color: #454953; }
-/* line 62, admin-theme/_admin-nav.sass */
+/* line 61, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab a.title {
   display: block;
   position: relative;
@@ -7893,7 +7893,7 @@ a.link-social:hover {
   -moz-transition-timing-function: ease-out;
   -o-transition-timing-function: ease-out;
   transition-timing-function: ease-out; }
-/* line 77, admin-theme/_admin-nav.sass */
+/* line 76, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab a.title i {
   color: #9094a2;
   background-color: #17181c;
@@ -7907,14 +7907,14 @@ a.link-social:hover {
   -moz-transition-timing-function: ease-out;
   -o-transition-timing-function: ease-out;
   transition-timing-function: ease-out; }
-/* line 83, admin-theme/_admin-nav.sass */
+/* line 82, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab a.title:hover {
   background-color: #686d7d;
   color: white; }
-/* line 86, admin-theme/_admin-nav.sass */
+/* line 85, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab a.title:hover i {
   color: white; }
-/* line 88, admin-theme/_admin-nav.sass */
+/* line 87, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab span.submenu_expand {
   position: absolute;
   right: 10px;
@@ -7926,15 +7926,15 @@ a.link-social:hover {
   color: black;
   background-color: transparent;
   text-shadow: #686d7d 1px 1px 0; }
-/* line 101, admin-theme/_admin-nav.sass */
+/* line 99, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.menu li.maintab span.submenu_expand:hover {
   color: white;
   text-shadow: #232429 -1px -1px 0; }
-/* line 104, admin-theme/_admin-nav.sass */
+/* line 102, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.submenu {
   list-style: none;
   padding: 0; }
-/* line 108, admin-theme/_admin-nav.sass */
+/* line 106, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.submenu li a {
   display: block;
   padding: 4px 5px 4px 10px;
@@ -7942,15 +7942,15 @@ a.link-social:hover {
   border: none;
   border-bottom: solid 1px #eeeeee;
   background-color: white; }
-/* line 115, admin-theme/_admin-nav.sass */
+/* line 113, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.submenu li a:hover {
   color: #515561;
   background-color: #edeeef;
   text-decoration: none; }
-/* line 119, admin-theme/_admin-nav.sass */
+/* line 117, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.submenu li:last-child a {
   border-bottom: none; }
-/* line 121, admin-theme/_admin-nav.sass */
+/* line 119, admin-theme/_admin-nav.sass */
 #nav-sidebar ul.submenu li.active a {
   color: white;
   background-color: #1ba6e5;
@@ -7960,7 +7960,7 @@ a.link-social:hover {
   #nav-sidebar {
     display: none; } }
 
-/* line 128, admin-theme/_admin-nav.sass */
+/* line 126, admin-theme/_admin-nav.sass */
 #nav-topbar {
   position: fixed;
   height: 28px;
@@ -7969,14 +7969,14 @@ a.link-social:hover {
   width: 100%;
   z-index: 600;
   background-color: white; }
-/* line 136, admin-theme/_admin-nav.sass */
+/* line 134, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu {
   height: 28px;
   margin: 0;
   padding: 0;
   display: block;
   list-style: none; }
-/* line 142, admin-theme/_admin-nav.sass */
+/* line 140, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li {
   height: 28px;
   padding: 0;
@@ -7985,46 +7985,46 @@ a.link-social:hover {
   list-style: none;
   position: relative;
   float: left; }
-/* line 150, admin-theme/_admin-nav.sass */
+/* line 148, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li > a {
   display: block;
   line-height: 28px;
   color: #515561;
   padding: 0 6px;
   margin: 0; }
-/* line 156, admin-theme/_admin-nav.sass */
+/* line 154, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li > a i {
   margin: 0;
   width: 15px;
   background-color: transparent;
   font-size: 18px; }
-/* line 161, admin-theme/_admin-nav.sass */
+/* line 159, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li > a:hover {
   text-decoration: none;
   background-color: #515561;
   color: white; }
-/* line 165, admin-theme/_admin-nav.sass */
+/* line 163, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li > a:hover i {
   color: white !important; }
-/* line 168, admin-theme/_admin-nav.sass */
+/* line 166, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li.active > a {
   color: white;
   background-color: #515561; }
-/* line 171, admin-theme/_admin-nav.sass */
+/* line 169, admin-theme/_admin-nav.sass */
 #nav-topbar ul.menu > li.active > a i {
   color: white; }
-/* line 173, admin-theme/_admin-nav.sass */
+/* line 171, admin-theme/_admin-nav.sass */
 #nav-topbar .menu-collapse {
   display: none; }
-/* line 175, admin-theme/_admin-nav.sass */
+/* line 173, admin-theme/_admin-nav.sass */
 #nav-topbar ul.submenu {
   display: none !important;
   -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px;
   box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px; }
-/* line 179, admin-theme/_admin-nav.sass */
+/* line 177, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li.expanded ul.submenu {
   display: block !important; }
-/* line 182, admin-theme/_admin-nav.sass */
+/* line 180, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li ul.submenu {
   display: none !important;
   position: absolute;
@@ -8033,33 +8033,33 @@ a.link-social:hover {
   left: 0;
   top: 28px;
   width: 200px !important; }
-/* line 190, admin-theme/_admin-nav.sass */
+/* line 188, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li ul.submenu li {
   width: 200px;
   padding: 0;
   list-style: none; }
-/* line 194, admin-theme/_admin-nav.sass */
+/* line 192, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li ul.submenu li a {
   display: block;
   padding: 4px 5px 4px 10px;
   font-size: 12px;
   background-color: white;
   border-bottom: solid 1px #eeeeee; }
-/* line 200, admin-theme/_admin-nav.sass */
+/* line 198, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li ul.submenu li a:hover {
   color: #515561;
   background-color: #edeeef;
   text-decoration: none; }
-/* line 204, admin-theme/_admin-nav.sass */
+/* line 202, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li ul.submenu li:last-child a {
   border-bottom: none; }
-/* line 206, admin-theme/_admin-nav.sass */
+/* line 204, admin-theme/_admin-nav.sass */
 #nav-topbar > ul.menu > li ul.submenu li.active a {
   color: white;
   background-color: #1ba6e5;
   border-bottom: solid 1px #1585b8; }
 
-/* line 211, admin-theme/_admin-nav.sass */
+/* line 209, admin-theme/_admin-nav.sass */
 .menu-collapse {
   height: 54px;
   width: 100%;
@@ -8071,25 +8071,26 @@ a.link-social:hover {
   border-bottom: 3px solid #3a3d45;
   color: #0b0c0e; }
 
-/* line 223, admin-theme/_admin-nav.sass */
+/* line 221, admin-theme/_admin-nav.sass */
 .page-topbar #main {
   padding-top: 64px; }
-/* line 225, admin-theme/_admin-nav.sass */
+/* line 223, admin-theme/_admin-nav.sass */
 .page-topbar #nav-sidebar {
   display: none; }
-/* line 227, admin-theme/_admin-nav.sass */
+/* line 225, admin-theme/_admin-nav.sass */
 .page-topbar .page-head {
   top: 63px; }
-/* line 229, admin-theme/_admin-nav.sass */
+/* line 227, admin-theme/_admin-nav.sass */
 .page-topbar #content {
   margin-left: 0;
   width: 100%; }
-/* line 232, admin-theme/_admin-nav.sass */
+/* line 230, admin-theme/_admin-nav.sass */
 .page-topbar #content .page-head h2.page-title {
   padding: 0 0 0 20px; }
 
-/* line 236, admin-theme/_admin-nav.sass */
+/* line 234, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #nav-sidebar {
+  overflow: visible;
   width: 50px;
   -webkit-transition-property: width;
   -moz-transition-property: width;
@@ -8101,10 +8102,10 @@ a.link-social:hover {
   -moz-transition-timing-function: ease-out;
   -o-transition-timing-function: ease-out;
   transition-timing-function: ease-out; }
-/* line 241, admin-theme/_admin-nav.sass */
+/* line 240, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #nav-sidebar span.title {
   display: none; }
-/* line 243, admin-theme/_admin-nav.sass */
+/* line 242, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #nav-sidebar ul.submenu {
   display: none !important;
   padding-top: 37px;
@@ -8112,39 +8113,39 @@ a.link-social:hover {
   top: 0;
   -webkit-box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px;
   box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px; }
-/* line 249, admin-theme/_admin-nav.sass */
+/* line 248, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #nav-sidebar > ul > li:hover {
   width: 250px !important;
   position: relative; }
-/* line 252, admin-theme/_admin-nav.sass */
+/* line 251, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #nav-sidebar > ul > li:hover span.title {
   display: inline-block; }
-/* line 254, admin-theme/_admin-nav.sass */
+/* line 253, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #nav-sidebar > ul > li:hover ul.submenu {
   display: block !important;
   position: absolute;
   left: 50px;
   width: 200px !important; }
-/* line 259, admin-theme/_admin-nav.sass */
+/* line 258, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #content {
   margin-left: 50px; }
-/* line 261, admin-theme/_admin-nav.sass */
+/* line 260, admin-theme/_admin-nav.sass */
 .page-sidebar-closed #content .page-head h2.page-title {
   padding: 0 0 0 70px; }
 @media (max-width: 768px) {
-  /* line 261, admin-theme/_admin-nav.sass */
+  /* line 260, admin-theme/_admin-nav.sass */
   .page-sidebar-closed #content .page-head h2.page-title {
     padding: 0 0 0 20px; } }
 @media (max-width: 768px) {
-  /* line 259, admin-theme/_admin-nav.sass */
+  /* line 258, admin-theme/_admin-nav.sass */
   .page-sidebar-closed #content {
     margin-left: 0;
     width: 100%; } }
-/* line 268, admin-theme/_admin-nav.sass */
+/* line 267, admin-theme/_admin-nav.sass */
 .page-sidebar-closed .submenu_expand {
   display: none; }
 
-/* line 299, admin-theme/_admin-nav.sass */
+/* line 298, admin-theme/_admin-nav.sass */
 [class^="icon-Admin"] {
   margin-right: 6px; }
 
@@ -8176,39 +8177,43 @@ a.link-social:hover {
 .row-margin-bottom {
   margin-bottom: 15px; }
 
-/* line 17, admin-theme/_admin-commons.sass */
+/* line 16, admin-theme/_admin-commons.sass */
+.row-padding-top {
+  padding-top: 15px; }
+
+/* line 19, admin-theme/_admin-commons.sass */
 .thumbnail {
   background-color: white;
   border-color: #cccccc !important; }
 
-/* line 21, admin-theme/_admin-commons.sass */
+/* line 23, admin-theme/_admin-commons.sass */
 .badge, #header_notifs_icon_wrapper .notifs_badge, .badge.badge-success, .badge.badge-error {
   background-color: #8fc04d; }
-/* line 23, admin-theme/_admin-commons.sass */
+/* line 25, admin-theme/_admin-commons.sass */
 #header_notifs_icon_wrapper .badge-success.notifs_badge, .badge-success.badge {
   background-color: #5cb85c; }
-/* line 26, admin-theme/_admin-commons.sass */
+/* line 28, admin-theme/_admin-commons.sass */
 #header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge {
   background-color: #d9534f; }
 
-/* line 31, admin-theme/_admin-commons.sass */
+/* line 33, admin-theme/_admin-commons.sass */
 .nav-tabs {
   border-bottom: none; }
-/* line 33, admin-theme/_admin-commons.sass */
+/* line 35, admin-theme/_admin-commons.sass */
 .nav-tabs li a {
   font-size: 1.1em;
   font-family: "Ubuntu", sans-serif;
   text-transform: uppercase;
   font-weight: 300; }
-/* line 39, admin-theme/_admin-commons.sass */
+/* line 41, admin-theme/_admin-commons.sass */
 .nav-tabs li.active a, .nav-tabs li.active a:hover {
   background-color: white; }
 
-/* line 42, admin-theme/_admin-commons.sass */
+/* line 44, admin-theme/_admin-commons.sass */
 .alert.alert-danger, #carrier_wizard .wizard_error {
   padding-left: 60px;
   position: relative; }
-/* line 45, admin-theme/_admin-commons.sass */
+/* line 47, admin-theme/_admin-commons.sass */
 .alert.alert-danger:before, #carrier_wizard .wizard_error:before {
   position: absolute;
   top: 0;
@@ -8224,7 +8229,31 @@ a.link-social:hover {
   -webkit-font-smoothing: antialiased;
   content: "\f00d"; }
 
-/* line 61, admin-theme/_admin-commons.sass */
+/* line 62, admin-theme/_admin-commons.sass */
+.alert.alert-success, #carrier_wizard .alert-success.wizard_error {
+  padding-left: 60px;
+  position: relative; }
+/* line 65, admin-theme/_admin-commons.sass */
+.alert.alert-success:before, #carrier_wizard .alert-success.wizard_error:before {
+  position: absolute;
+  top: 0;
+  left: 10px;
+  display: block;
+  min-height: 25px;
+  min-width: 25px;
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  font-size: 35px;
+  text-decoration: inherit;
+  -webkit-font-smoothing: antialiased;
+  content: "\f00c"; }
+
+/* line 81, admin-theme/_admin-commons.sass */
+.panel .panel-footer, #header_notifs_icon_wrapper .notifs_panel .panel-footer, #dash_version .panel-footer, #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer {
+  margin: 0 -20px -20px; }
+
+/* line 86, admin-theme/_admin-commons.sass */
 .overflow-y {
   height: 200px;
   overflow-y: auto; }
@@ -9099,6 +9128,14 @@ textarea {
   font-weight: 700;
   background-color: #00a4e7; }
 /* line 174, admin-theme/_admin-date-range-picker.sass */
+#datepicker .daterangepicker td.end-selected.start-selected.range-compare {
+  background-color: #4ca0b1;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -ms-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0; }
+/* line 177, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td.end-selected-compare.start-selected-compare {
   color: white;
   -webkit-border-radius: 15px;
@@ -9108,24 +9145,32 @@ textarea {
   border-radius: 15px;
   font-weight: 700;
   background-color: #ff8000; }
-/* line 179, admin-theme/_admin-date-range-picker.sass */
+/* line 182, admin-theme/_admin-date-range-picker.sass */
+#datepicker .daterangepicker td.end-selected-compare.start-selected-compare.range {
+  background-color: #ba924c;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -ms-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0; }
+/* line 185, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td.range {
   color: #cef1ff;
   background-color: #1bbdff; }
-/* line 182, admin-theme/_admin-date-range-picker.sass */
+/* line 188, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td.range.range-compare {
   background-color: #8dab99; }
-/* line 184, admin-theme/_admin-date-range-picker.sass */
+/* line 190, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td.range-compare {
   color: #fff2e5;
   background-color: #ff9933; }
-/* line 187, admin-theme/_admin-date-range-picker.sass */
+/* line 193, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td.range-compare.range {
   background-color: #8dab99; }
-/* line 189, admin-theme/_admin-date-range-picker.sass */
+/* line 195, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td.today {
   background-color: white; }
-/* line 191, admin-theme/_admin-date-range-picker.sass */
+/* line 197, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td span {
   padding: 0;
   display: block;
@@ -9136,31 +9181,31 @@ textarea {
   float: left;
   text-transform: uppercase;
   cursor: pointer; }
-/* line 201, admin-theme/_admin-date-range-picker.sass */
+/* line 207, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td span:hover {
   background-color: #00a4e7; }
-/* line 203, admin-theme/_admin-date-range-picker.sass */
+/* line 209, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td span.active {
   background-color: #00a4e7;
   color: white; }
-/* line 206, admin-theme/_admin-date-range-picker.sass */
+/* line 212, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker td span.old {
   color: #cccccc; }
-/* line 209, admin-theme/_admin-date-range-picker.sass */
+/* line 215, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker th.switch {
   width: 145px; }
-/* line 211, admin-theme/_admin-date-range-picker.sass */
+/* line 217, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker th.next, #datepicker .daterangepicker th.prev {
   font-size: 1.3em; }
-/* line 213, admin-theme/_admin-date-range-picker.sass */
+/* line 219, admin-theme/_admin-date-range-picker.sass */
 #datepicker .daterangepicker thead tr:first-child th {
   cursor: pointer; }
 
-/* line 217, admin-theme/_admin-date-range-picker.sass */
+/* line 223, admin-theme/_admin-date-range-picker.sass */
 .chevron-left, .chevron-right {
   position: relative; }
 
-/* line 219, admin-theme/_admin-date-range-picker.sass */
+/* line 225, admin-theme/_admin-date-range-picker.sass */
 .chevron-left:before, .chevron-right:before {
   display: block;
   content: "";
@@ -9169,7 +9214,7 @@ textarea {
   border-style: solid;
   position: absolute; }
 
-/* line 226, admin-theme/_admin-date-range-picker.sass */
+/* line 232, admin-theme/_admin-date-range-picker.sass */
 .chevron-left:before {
   right: 0;
   top: 0;
@@ -9177,7 +9222,7 @@ textarea {
   border-color: transparent transparent transparent #00a4e7;
   background-color: #1bbdff; }
 
-/* line 232, admin-theme/_admin-date-range-picker.sass */
+/* line 238, admin-theme/_admin-date-range-picker.sass */
 .chevron-right:before {
   left: 0;
   top: 0;
@@ -9185,7 +9230,7 @@ textarea {
   border-color: transparent transparent transparent #1bbdff;
   background-color: #00a4e7; }
 
-/* line 238, admin-theme/_admin-date-range-picker.sass */
+/* line 244, admin-theme/_admin-date-range-picker.sass */
 .input-complete {
   -webkit-animation: one 0.2s ease-in-out;
   -moz-animation: one 0.2s ease-in-out;
@@ -9194,21 +9239,21 @@ textarea {
   animation: one 0.2s ease-in-out; }
 
 @-webkit-keyframes one {
-  /* line 246, admin-theme/_admin-date-range-picker.sass */
+  /* line 252, admin-theme/_admin-date-range-picker.sass */
   0% {
     background-color: #00a4e7; }
 
-  /* line 248, admin-theme/_admin-date-range-picker.sass */
+  /* line 254, admin-theme/_admin-date-range-picker.sass */
   100% {
     background-color: white; } }
 
 @-webkit-keyframes two {
-  /* line 252, admin-theme/_admin-date-range-picker.sass */
+  /* line 258, admin-theme/_admin-date-range-picker.sass */
   0% {
     -webkit-box-shadow: #00a4e7 0 0 0 20px inset;
     box-shadow: #00a4e7 0 0 0 20px inset; }
 
-  /* line 254, admin-theme/_admin-date-range-picker.sass */
+  /* line 260, admin-theme/_admin-date-range-picker.sass */
   100% {
     -webkit-box-shadow: #00a4e7 0 0 0 inset;
     box-shadow: #00a4e7 0 0 0 inset; } }
diff --git a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass
index deb57269c..01f15244f 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass
@@ -13,6 +13,8 @@
 
 .row-margin-bottom
 	margin-bottom: 15px
+.row-padding-top
+	padding-top: 15px
 
 .thumbnail
 	background-color: white
@@ -57,6 +59,29 @@
 		-webkit-font-smoothing: antialiased
 		content: "\f00d"
 
+.alert.alert-success
+	padding-left: 60px
+	position: relative
+	&:before
+		position: absolute
+		top: 0
+		left: 10px
+		display: block
+		min-height: 25px
+		min-width: 25px
+		font-family: FontAwesome
+		font-weight: normal
+		font-style: normal
+		font-size: 35px
+		text-decoration: inherit
+		-webkit-font-smoothing: antialiased
+		content: "\f00c"
+
+.panel
+	.panel-footer
+		margin: 0 -20px -20px
+
+
 
 .overflow-y
 	height: 200px
diff --git a/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass b/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass
index 8a4fa2429..396f3ce4d 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass
@@ -171,11 +171,17 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
 				+border-radius(15px)
 				font-weight: 700
 				background-color: $color-calendar-day-selected
+				&.range-compare
+					background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%)
+					+border-radius(0)
 			&.end-selected-compare.start-selected-compare
 				color: $color-bright
 				+border-radius(15px)
 				font-weight: 700
 				background-color: $color-calendar-day-selected-compare
+				&.range
+					background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%)
+					+border-radius(0)
 			&.range
 				color: lighten($color-calendar-range,35%)
 				background-color: $color-calendar-range
diff --git a/admin-dev/themes/default/css/admin-theme/_admin-nav.sass b/admin-dev/themes/default/css/admin-theme/_admin-nav.sass
index 9afd24888..728b4b50a 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-nav.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-nav.sass
@@ -1,5 +1,5 @@
 #nav-sidebar
-	float: left
+	position: fixed
 	width: 240px
 	height: 100%!important
 	overflow-y: auto
@@ -35,7 +35,6 @@
 					i
 						color: black
 						background-color: white
-
 			&.active
 				a.title:hover
 					color: contrast-color($main-color, white, #333, 10%)
@@ -97,7 +96,6 @@
 				background-color: transparent
 				@extend .icon-angle-down
 				@include text-shadow(lighten($main-color,10%) 1px 1px 0)
-
 				&:hover
 					color: white
 					@include text-shadow(darken($main-color,20%) -1px -1px 0)
@@ -234,6 +232,7 @@
 
 .page-sidebar-closed
 	#nav-sidebar
+		overflow: visible 
 		width: 50px
 		@include transition-property(width)
 		@include transition-duration(0.4s)
diff --git a/admin-dev/themes/default/css/admin-theme/_ladda-theme.sass b/admin-dev/themes/default/css/admin-theme/_ladda-theme.sass
deleted file mode 100755
index f620efa15..000000000
--- a/admin-dev/themes/default/css/admin-theme/_ladda-theme.sass
+++ /dev/null
@@ -1,27 +0,0 @@
-$green: #2aca76
-$blue: #53b5e6
-$red: #ea8557
-$purple: #9973C2
-$mint: #16a085
-
-.ladda-button
-	&[disabled],
-	&[data-loading]
-		border-color: rgba( 0, 0, 0, 0.07 )
-		cursor: default
-		background-color: #999
-		&:hover
-			cursor: default
-			background-color: #999
-	&[data-size=xs]
-		padding: 4px 8px
-		.ladda-label
-			font-size: 0.7em
-	&[data-size=s]
-		padding: 6px 10px
-		.ladda-label
-			font-size: 0.9em
-	&[data-size=l] .ladda-label
-		font-size: 1.2em
-	&[data-size=xl] .ladda-label
-		font-size: 1.5em
\ No newline at end of file
diff --git a/admin-dev/themes/default/js/date-range-picker.js b/admin-dev/themes/default/js/date-range-picker.js
index c6edbf757..09b217283 100644
--- a/admin-dev/themes/default/js/date-range-picker.js
+++ b/admin-dev/themes/default/js/date-range-picker.js
@@ -307,6 +307,10 @@
 				}
 
 				if (endCompare && startCompare) {
+					$(this).removeClass("range-compare")
+						.removeClass("start-selected-compare")
+						.removeClass("end-selected-compare");
+
 					if(date_val > startCompare && date_val < endCompare) {
 						$(this).not(".old").not(".new").addClass("range-compare");
 					}
diff --git a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
index 3d2217bfd..fb7d343c9 100644
--- a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
@@ -60,7 +60,7 @@
 								html.append($('<li>').html(file))
 							});
 							$('#changedFiles')
-								.append($('<h3>').html(lang+' ('+json[key].length+')'))
+								.append($('<h4>').html(lang+' ('+json[key].length+')'))
 								.append(html);
 						}
 					});
diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
index ffe93c246..1a52d930f 100644
--- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
@@ -32,7 +32,12 @@
 	{/if}
 	{$smarty.block.parent}
 	{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'}
-			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache & Autoload cache'}</a>
+		<div class="clearfix row-padding-top">
+			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default" href="">
+				<i class="icon-eraser"></i>
+				{l s='Clear Smarty cache & Autoload cache'}
+			</a>
+		</div>
 	{/if}		
 {/block}
 
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index b7d57463c..c6440e6df 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -94,8 +94,10 @@
 
 	<div id="warn_virtual_combinations" class="alert alert-warning" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div>
 
-	<div class="row">
-		<label class="control-label col-lg-3" for="simple_product">{$bullet_common_field} {l s='Type:'}</label>
+	<div class="form-group">
+		<label class="control-label col-lg-3" for="simple_product">
+			{$bullet_common_field} {l s='Type:'}
+		</label>
 		<div class="col-lg-9">
 			<div class="radio">
 				<label for="simple_product">
@@ -120,7 +122,7 @@
 
 	<hr/>
 
-	<div class="row">
+	<div class="form-group">
 		<label class="control-label col-lg-3 required" for="name_{$id_lang}">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Invalid characters:'} &lt;&gt;;=#{}">
@@ -128,18 +130,16 @@
 			</span>
 		</label>
 		<div class="col-lg-5">
-			<div class="row">
-				{include file="controllers/products/input_text_lang.tpl"
-					languages=$languages
-					input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
-					input_value=$product->name
-					input_name="name"
-				}
-			</div>
+			{include file="controllers/products/input_text_lang.tpl"
+				languages=$languages
+				input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
+				input_value=$product->name
+				input_name="name"
+			}
 		</div>
 	</div>
 
-	<div class="row">
+	<div class="form-group">
 		<label class="control-label col-lg-3" for="reference">
 			<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='Special characters allowed:'} .-_#\">
@@ -151,7 +151,7 @@
 		</div>
 	</div>
 
-	<div class="row">
+	<div class="form-group">
 		<label class="control-label col-lg-3" for="ean13">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='(Europe, Japan)'}">
@@ -163,7 +163,7 @@
 		</div>
 	</div>
 
-	<div class="row">
+	<div class="form-group">
 		<label class="control-label col-lg-3" for="upc">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='(US, Canada)'}">
@@ -178,7 +178,7 @@
 	<hr/>
 
 	{* status informations *}	
-	<div class="row">		
+	<div class="form-group">		
 		<label class="control-label col-lg-3">
 			{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
 			{l s='Status:'}
@@ -187,18 +187,20 @@
 			<span class="switch prestashop-switch">
 				<input onclick="toggleDraftWarning(false);showOptions(true);showRedirectProductOptions(false);" type="radio" name="active" id="active_on" value="1" {if $product->active || !$product->isAssociatedToShop()}checked="checked" {/if} />
 				<label for="active_on" class="radioCheck">
-					<i class="icon-check-sign"></i> {l s='Enabled'}
+					<i class="icon-check-sign text-success"></i>
+					{l s='Enabled'}
 				</label>
 				<input onclick="toggleDraftWarning(true);showOptions(false);showRedirectProductOptions(true);"  type="radio" name="active" id="active_off" value="0" {if !$product->active && $product->isAssociatedToShop()}checked="checked"{/if} />
 				<label for="active_off" class="radioCheck">
-					<i class="icon-ban-circle"></i> {l s='Disabled'}
+					<i class="icon-ban-circle text-danger"></i>
+					{l s='Disabled'}
 				</label>
 				<span class="slide-button btn btn-default"></span>
 			</span>
 		</div>
 	</div>
 
-	<div class="row redirect_product_options" style="display:none">		
+	<div class="form-group redirect_product_options" style="display:none">		
 		<label class="control-label col-lg-3" for="redirect_type">
 			{include file="controllers/products/multishop/checkbox.tpl" field="redirect_type" type="radio" onclick=""}
 			{l s='Redirect when disabled'}
@@ -211,7 +213,7 @@
 			</select>
 		</div>
 	</div>
-	<div class="row redirect_product_options" style="display:none">
+	<div class="form-group redirect_product_options" style="display:none">
 		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert alert-info">
 				{l s='404 Not Found = Do not redirect and display a 404 page'}<br/>
@@ -221,7 +223,7 @@
 		</div>
 	</div>
 
-	<div class="row redirect_product_options redirect_product_options_product_choise" style="display:none">		
+	<div class="form-group redirect_product_options redirect_product_options_product_choise" style="display:none">		
 		<label class="control-label col-lg-3" for="related_product_autocomplete_input">
 			{include file="controllers/products/multishop/checkbox.tpl" field="id_product_redirected" type="radio" onclick=""}
 			{l s='Related product:'}
@@ -248,7 +250,7 @@
 		</script>
 	</div>
 
-	<div class="row">		
+	<div class="form-group">		
 		<label class="control-label col-lg-3" for="visibility">
 			{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
 			{l s='Visibility:'}
@@ -263,7 +265,7 @@
 		</div>
 	</div>
 
-	<div id="product_options" class="row" {if !$product->active}style="display:none"{/if} >
+	<div id="product_options" class="form-group" {if !$product->active}style="display:none"{/if} >
 		<div class="col-lg-12">
 			<div class="form-group">
 				<label class="control-label col-lg-3" for="available_for_order">
@@ -347,7 +349,7 @@
 	</div>
 
 	{if $images}
-	<div class="row">
+	<div class="form-group">
 		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert alert-info">
 				{l s='Would you like to add an image in your description?'}
@@ -357,7 +359,7 @@
 	</div>
 
 	<div id="createImageDescription" class="panel" style="display:none">
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3" for="smallImage_0">{l s='Select your image:'}</label>
 			<div class="col-lg-9">
 				<ul class="list-inline">
@@ -372,7 +374,7 @@
 				</ul>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label>
 			<div class="col-lg-5">
 				<p class="checkbox">
@@ -385,7 +387,7 @@
 				</p>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3" for="imageTypes_0">{l s='Select the type of picture:'}</label>
 			<div class="col-lg-5">
 				{foreach from=$imagesTypes key=key item=type}
@@ -398,7 +400,7 @@
 				{/foreach}
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3" for="resultImage">
 				<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='The tag to copy/paste into the description.'}">
diff --git a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
index 7f74defcb..d849b161c 100644
--- a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+++ b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
@@ -25,12 +25,14 @@
 
 {foreach from=$languages item=language}
 	{if $languages|count > 1}
-	<div class="translatable-field lang-{$language.id_lang}">
+	<div class="translatable-field row lang-{$language.id_lang}">
 		<div class="col-lg-9">
 	{/if}
-			{if isset($maxchar)}
-			<div class="input-group">
-			<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon"><span class="text-count-down">{$maxchar}</span></span>
+		{if isset($maxchar)}
+		<div class="input-group">
+			<span id="{$input_name}_{$language.id_lang}_counter" class="input-group-addon">
+				<span class="text-count-down">{$maxchar}</span>
+			</span>
 			{/if}
 			<input type="text"
 			id="{$input_name}_{$language.id_lang}"
@@ -42,8 +44,8 @@
 			{if isset($maxchar)} data-maxchar="{$maxchar}"{/if}
 			{if isset($maxlength)} maxlength="{$maxlength}"{/if} />
 			{if isset($maxchar)}
-			</div>
-			{/if}
+		</div>
+		{/if}
 	{if $languages|count > 1}
 		</div>
 		<div class="col-lg-2">
diff --git a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
index ec20a8a0b..cffda609d 100644
--- a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+++ b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
@@ -191,7 +191,15 @@
 				datepickerEnd.setValue(ev.date.setMonth(ev.date.getMonth()+1));
 			}
 		}).data('daterangepicker');
+	{/literal}
 
+		startDate = parseDate($("#date-start").val(), parseFormat('{$date_format}'));
+		endDate = parseDate($("#date-end").val(), parseFormat('{$date_format}'));
+
+		if (startDate.getFullYear() == endDate.getFullYear() && startDate.getMonth() == endDate.getMonth())
+			datepickerStart.setValue(startDate.setMonth(startDate.getMonth()-1));
+
+	{literal}
 		var datepickerEnd = $('.datepicker2').daterangepicker({
 			"dates": translated_dates,
 			"weekStart": 1,
@@ -220,6 +228,7 @@
 		$("#date-start-compare").focus(function() {
 			datepickerStart.setCompare(true);
 			datepickerEnd.setCompare(true);
+			$('#compare-options').val(3);
 			$(".date-input").removeClass("input-selected");
 			$(this).addClass("input-selected");
 		});
@@ -227,6 +236,7 @@
 		$("#date-end-compare").focus(function() {
 			datepickerStart.setCompare(true);
 			datepickerEnd.setCompare(true);
+			$('#compare-options').val(3);
 			$(".date-input").removeClass("input-selected");
 			$(this).addClass("input-selected");
 		});
@@ -241,16 +251,9 @@
 
 		$('#datepicker-compare').click(function() {
 			if ($(this).attr("checked")) {
-				if ($("#date-start-compare").val().replace(/^\s+|\s+$/g, '').length == 0)
-					$('#compare-options').trigger('change');
-
-				datepickerStart.setStartCompare($("#date-start-compare").val());
-				datepickerStart.setEndCompare($("#date-end-compare").val());
-				datepickerEnd.setStartCompare($("#date-start-compare").val());
-				datepickerEnd.setEndCompare($("#date-end-compare").val());
+				$('#compare-options').trigger('change');
 				$('#form-date-body-compare').show();
 				$('#compare-options').prop('disabled', false);
-				$('#date-start-compare').focus();
 			} else {
 				datepickerStart.setStartCompare(null);
 				datepickerStart.setEndCompare(null);
@@ -268,8 +271,16 @@
 				
 			if (this.value == 2)
 				setPreviousYear();
-	
-			$('#date-start-compare').focus();
+
+			datepickerStart.setStartCompare($("#date-start-compare").val());
+			datepickerStart.setEndCompare($("#date-end-compare").val());
+			datepickerEnd.setStartCompare($("#date-start-compare").val());
+			datepickerEnd.setEndCompare($("#date-end-compare").val());
+			datepickerStart.setCompare(true);
+			datepickerEnd.setCompare(true);
+
+			if (this.value == 3)
+				$('#date-start-compare').focus();
 		});
 
 		if ($('#datepicker-compare').attr("checked"))
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 87c3cb778..dc5815b1a 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -256,7 +256,7 @@
 							--
 						{else}
 							{if $params.type == 'bool'}
-								<select class="filter" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
+								<select class="filter fixed-width-sm" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
 									<option value="">--</option>
 									<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
 									<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
diff --git a/admin-dev/themes/default/template/nav.tpl b/admin-dev/themes/default/template/nav.tpl
index 7bf623731..6ba80b513 100644
--- a/admin-dev/themes/default/template/nav.tpl
+++ b/admin-dev/themes/default/template/nav.tpl
@@ -1,4 +1,4 @@
-<nav id="nav-sidebar" data-spy="affix" data-offset-top="0" role="navigation">
+<nav id="nav-sidebar" role="navigation">
 {if !$tab}
 	<div class="mainsubtablist" style="display:none"></div>
 {/if}
@@ -31,5 +31,4 @@
 		{/if}
 	{/foreach}
 	</ul>
-
 </nav>
\ No newline at end of file
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index 5f4e79ccf..8ea7517f7 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -31,10 +31,10 @@ class AdminFeaturesControllerCore extends AdminController
 
 	public function __construct()
 	{
-	 	$this->table = 'feature';
+		$this->table = 'feature';
 		$this->className = 'Feature';
 		$this->list_id = 'feature';
-	 	$this->lang = true;
+		$this->lang = true;
 
 		$this->fields_list = array(
 			'id_feature' => array(
@@ -63,7 +63,7 @@ class AdminFeaturesControllerCore extends AdminController
 			)
 		);
 
-	 	$this->bulk_actions = array(
+		$this->bulk_actions = array(
 			'delete' => array(
 				'text' => $this->l('Delete selected'),
 				'icon' => $this->l('icon-trash'),
@@ -82,15 +82,15 @@ class AdminFeaturesControllerCore extends AdminController
 		$this->addRowAction('edit');
 		$this->addRowAction('delete');
 		$this->addRowAction('view');
-	 	$this->_defaultOrderBy = 'position';
+		$this->_defaultOrderBy = 'position';
 
-	 	// Added specific button in toolbar
-	 	$this->toolbar_btn['newAttributes'] = array(
+		// Added specific button in toolbar
+		$this->toolbar_btn['newAttributes'] = array(
 			'href' => self::$currentIndex.'&amp;addfeature_value&amp;token='.$this->token,
 			'desc' => $this->l('Add new feature values')
 		);
 
-	 	$this->toolbar_btn['new'] = array(
+		$this->toolbar_btn['new'] = array(
 			'href' => self::$currentIndex.'&amp;addfeature&amp;token='.$this->token,
 			'desc' => $this->l('Add a new feature')
 		);
@@ -137,6 +137,7 @@ class AdminFeaturesControllerCore extends AdminController
 			}
 
 			$this->feature_name = $obj->name;
+			$this->toolbar_title = $this->feature_name;        
 			$this->fields_list = array(
 				'id_feature_value' => array(
 					'title' => $this->l('ID'),
@@ -149,27 +150,9 @@ class AdminFeaturesControllerCore extends AdminController
 			);
 
 			$this->_where = sprintf('AND `id_feature` = %d', (int)$id);
-
-			// get list and force no limit clause in the request
-			$this->getList($this->context->language->id, 'id_feature_value', 'ASC');
-			
-			// Render list
-			$helper = new HelperList();
-			$helper->actions = $this->actions;
-			$helper->no_link = true;
-			$helper->shopLinkType = '';
-			$helper->identifier = $this->identifier;
-			$helper->toolbar_scroll = false;
-			$helper->currentIndex = self::$currentIndex;
-			$helper->token = $this->token;
-			$helper->table = $this->table;
-			$helper->simple_header = true;
-			$helper->show_toolbar = false;
-			$helper->bulk_actions = $this->bulk_actions;
-			$content = $helper->generateList($this->_list, $this->fields_list);
-
-			echo Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content));
-			exit;
+			self::$currentIndex = self::$currentIndex.'&id_feature='.(int)$id.'&viewfeature';
+			$this->processFilter();
+			return parent::renderList();
 		}
 	}
 
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index ffe7c0ec0..d42a3955b 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -205,6 +205,8 @@ class AdminGroupsControllerCore extends AdminController
 		$this->lang = false;
 		$this->list_id = 'customer_group';
 		$this->actions = array();
+		$this->addRowAction('edit');
+		$this->identifier = 'id_customer';
 		$this->bulk_actions = false;
 		$this->list_no_link = true;
 		$this->fields_list = (array(
@@ -553,4 +555,24 @@ class AdminGroupsControllerCore extends AdminController
 		$this->displayInformation($default_group_information);
 		return parent::renderList();
 	}
+
+	public function displayEditLink($token = null, $id, $name = null)
+	{
+		$tpl = $this->createTemplate('helpers/list/list_action_edit.tpl');
+		if (!array_key_exists('Edit', self::$cache_lang))
+			self::$cache_lang['Edit'] = $this->l('Edit', 'Helper');
+
+		$href = self::$currentIndex.'&'.$this->identifier.'='.$id.'&update'.$this->table.'&token='.($token != null ? $token : $this->token);
+
+		if ($this->display == 'view')
+			$href = Context::getContext()->link->getAdminLink('AdminCustomers').'&id_customer='.(int)$id.'&updatecustomer';
+
+		$tpl->assign(array(
+			'href' => $href,
+			'action' => self::$cache_lang['Edit'],
+			'id' => $id
+		));
+
+		return $tpl->fetch();
+	}
 }
diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
index 052d33907..27b54688b 100644
--- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
@@ -42,7 +42,7 @@
 		<ul class="data_list_large">
 			<li>
 				<span class="data_label size_l">
-					{l s='Online Visitor' mod='dashactivity'}
+					{l s='Online Visitors' mod='dashactivity'}
 					<small class="text-muted"><br/>
 						{l s='In the last 30 minutes' mod='dashactivity'}
 					</small>