diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 05a2113ff..52a639b65 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -6151,7 +6151,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before,
   content: "\f00c"; }
 
 /* line 419, admin-theme/_font-awesome.scss */
-.icon-remove:before, .process-icon-cancel:before {
+.icon-remove:before, .alert.alert-danger:before:before, #carrier_wizard .wizard_error:before:before, .process-icon-cancel:before {
   content: "\f00d"; }
 
 /* line 422, admin-theme/_font-awesome.scss */
@@ -8204,6 +8204,22 @@ a.link-social:hover {
 .nav-tabs li.active a, .nav-tabs li.active a:hover {
   background-color: white; }
 
+/* line 42, admin-theme/_admin-commons.sass */
+.alert.alert-danger, #carrier_wizard .wizard_error {
+  padding-left: 60px;
+  position: relative; }
+/* line 45, admin-theme/_admin-commons.sass */
+.alert.alert-danger:before, #carrier_wizard .wizard_error:before {
+  content: "\f00d";
+  position: absolute;
+  top: 0;
+  left: 0; }
+
+/* line 52, admin-theme/_admin-commons.sass */
+.overflow-y {
+  height: 200px;
+  overflow-y: auto; }
+
 /* line 1, admin-theme/_admin-tables.sass */
 .table {
   border-collapse: separate;
@@ -8876,112 +8892,75 @@ textarea {
 /* line 19, admin-theme/_admin-date-range-picker.sass */
 #datepicker #date-end.input-selected {
   border: solid 3px #0d5373; }
-/* line 21, admin-theme/_admin-date-range-picker.sass */
-#datepicker .datepickers-container {
-  width: 60%;
-  float: left;
-  margin: 0;
-  font-size: 16px;
-  height: 16.8em; }
-/* line 27, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form {
-  width: 40%;
-  float: left;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  -ms-border-radius: 0;
-  -o-border-radius: 0;
-  border-radius: 0;
-  border: none; }
-/* line 32, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form #date-range .form-date-heading {
+/* line 22, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form #date-range .form-date-heading {
+  background-color: #1896cf; }
+/* line 24, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form #date-compare .form-date-heading {
   background-color: #dd7d5b; }
-/* line 34, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form #date-compare .form-date-heading {
-  background-color: #dd7d5b; }
-/* line 36, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-heading {
+/* line 26, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-heading {
+  padding: 6px; }
+/* line 28, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-heading .title, #datepicker div#datepicker-form .form-date-heading .checkbox-title label {
   font-family: "Josefin Sans", sans-serif;
   font-size: 1.15em;
-  padding: 6px;
   color: white;
   font-weight: 200;
-  text-transform: uppercase; }
-/* line 43, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-heading .btn-default {
+  text-transform: uppercase;
+  line-height: 2em; }
+/* line 35, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-heading .btn-default {
   background-color: rgba(255, 255, 255, 0.3);
   font-weight: 700;
   color: white;
   border: none; }
-/* line 48, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-body {
-  padding: 10px; }
-/* line 50, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-group {
-  -webkit-box-shadow: #0b435c 0 0 4px;
-  box-shadow: #0b435c 0 0 4px;
-  background-color: white;
+/* line 40, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-body, #datepicker div#datepicker-form .form-date-actions {
   width: 100%;
-  margin: 0 auto 6px auto; }
-/* line 55, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-group label, #datepicker form#datepicker-form .form-date-group input {
+  padding: 10px;
+  background-color: white;
+  display: inline-block; }
+/* line 45, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-group {
+  width: 100%;
+  margin: 0 auto; }
+/* line 48, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-group label {
+  font-family: "Josefin Sans", sans-serif;
+  font-size: 0.8em;
+  font-weight: 700;
+  text-transform: uppercase;
+  color: #666666;
+  line-height: 3.2em;
+  margin-bottom: 0; }
+/* line 56, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-group label, #datepicker div#datepicker-form .form-date-group input {
   float: left;
   margin-right: 6px; }
-/* line 58, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-group label {
-  line-height: 3.2em;
-  font-weight: 700;
-  font-size: 0.8em;
-  margin-bottom: 0; }
-/* line 63, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .form-date-group input[type='text'] {
+/* line 59, admin-theme/_admin-date-range-picker.sass */
+#datepicker div#datepicker-form .form-date-group input[type='text'] {
   width: 35%; }
-/* line 65, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .actions {
-  -webkit-box-shadow: #0b435c 0 0 4px;
-  box-shadow: #0b435c 0 0 4px;
-  padding: 0;
-  background-color: #1ba6e5; }
-/* line 69, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .actions .btn-primary {
-  padding: 12px;
-  text-transform: uppercase;
-  background-color: white;
-  color: #0d5373;
-  border: none; }
-/* line 75, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form .actions .btn-default {
-  padding: 12px;
-  text-transform: uppercase;
-  color: #0d5373;
-  background: transparent;
-  border: none; }
-/* line 81, admin-theme/_admin-date-range-picker.sass */
-#datepicker form#datepicker-form label {
-  font-family: "Josefin Sans", sans-serif;
-  font-weight: 700;
-  text-transform: uppercase;
-  color: #666666; }
-/* line 86, admin-theme/_admin-date-range-picker.sass */
+/* line 62, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker {
   position: relative;
-  float: left;
-  margin-right: 1%;
-  width: 49%;
-  height: 100%;
+  margin: 0 0 8px 0;
+  width: 100%;
   background-color: #1ba6e5;
-  font-family: "Josefin Sans", sans-serif; }
-/* line 95, admin-theme/_admin-date-range-picker.sass */
+  font-family: "Josefin Sans", sans-serif;
+  font-size: 14px;
+  height: 16.8em; }
+/* line 70, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker table {
   width: 100%;
   margin: 0; }
-/* line 99, admin-theme/_admin-date-range-picker.sass */
+/* line 74, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker thead tr th:after {
   content: "";
   border-top: 1px solid #1585b8;
   width: 100%;
   display: block; }
-/* line 104, admin-theme/_admin-date-range-picker.sass */
+/* line 79, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker thead tr th {
   background-color: #1896cf;
   color: #8dd3f2;
@@ -8989,13 +8968,13 @@ textarea {
   font-weight: 700;
   border-bottom: solid 1px #3bb3e9;
   text-transform: uppercase; }
-/* line 111, admin-theme/_admin-date-range-picker.sass */
+/* line 86, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker thead tr:first-child th {
   background-color: white;
   font-weight: 200;
   font-size: 1.4em;
   color: #0d5373; }
-/* line 116, admin-theme/_admin-date-range-picker.sass */
+/* line 91, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td, #datepicker .datepicker th {
   text-align: center;
   height: 2em;
@@ -9003,12 +8982,12 @@ textarea {
   padding: 0;
   color: white;
   position: relative; }
-/* line 123, admin-theme/_admin-date-range-picker.sass */
+/* line 98, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td {
   font-weight: 400;
   padding: 0 10px;
   border-bottom: solid 1px #1ba6e5; }
-/* line 127, admin-theme/_admin-date-range-picker.sass */
+/* line 102, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.day:after {
   content: "";
   position: absolute;
@@ -9019,28 +8998,28 @@ textarea {
   height: 100%;
   z-index: 0;
   background-color: transparent; }
-/* line 137, admin-theme/_admin-date-range-picker.sass */
+/* line 112, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.day:hover {
   cursor: pointer; }
-/* line 139, admin-theme/_admin-date-range-picker.sass */
+/* line 114, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.day.disabled {
   color: #1275a1; }
-/* line 141, admin-theme/_admin-date-range-picker.sass */
+/* line 116, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.old, #datepicker .datepicker td.new {
   color: #1275a1; }
-/* line 143, admin-theme/_admin-date-range-picker.sass */
+/* line 118, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected) {
   font-weight: 700;
   background-color: #0d5373;
   border-bottom-left-radius: 15px;
   border-top-left-radius: 15px; }
-/* line 148, admin-theme/_admin-date-range-picker.sass */
+/* line 123, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected) {
   font-weight: 700;
   background-color: #0d5373;
   border-bottom-right-radius: 15px;
   border-top-right-radius: 15px; }
-/* line 153, admin-theme/_admin-date-range-picker.sass */
+/* line 128, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.end-selected.start-selected {
   -webkit-border-radius: 15px;
   -moz-border-radius: 15px;
@@ -9049,14 +9028,14 @@ textarea {
   border-radius: 15px;
   font-weight: 700;
   background-color: #0d5373; }
-/* line 157, admin-theme/_admin-date-range-picker.sass */
+/* line 132, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.range {
   color: #77caef;
   background-color: #1275a1; }
-/* line 160, admin-theme/_admin-date-range-picker.sass */
+/* line 135, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td.today {
   background-color: white; }
-/* line 163, admin-theme/_admin-date-range-picker.sass */
+/* line 138, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td span {
   padding: 0;
   display: block;
@@ -9067,31 +9046,31 @@ textarea {
   float: left;
   text-transform: uppercase;
   cursor: pointer; }
-/* line 173, admin-theme/_admin-date-range-picker.sass */
+/* line 148, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td span:hover {
   background-color: #0d5373; }
-/* line 175, admin-theme/_admin-date-range-picker.sass */
+/* line 150, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td span.active {
   background-color: #0d5373;
   color: white; }
-/* line 178, admin-theme/_admin-date-range-picker.sass */
+/* line 153, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker td span.old {
   color: #1275a1; }
-/* line 181, admin-theme/_admin-date-range-picker.sass */
+/* line 156, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker th.switch {
   width: 145px; }
-/* line 183, admin-theme/_admin-date-range-picker.sass */
+/* line 158, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker th.next, #datepicker .datepicker th.prev {
   font-size: 1.3em; }
-/* line 185, admin-theme/_admin-date-range-picker.sass */
+/* line 160, admin-theme/_admin-date-range-picker.sass */
 #datepicker .datepicker thead tr:first-child th {
   cursor: pointer; }
 
-/* line 189, admin-theme/_admin-date-range-picker.sass */
+/* line 164, admin-theme/_admin-date-range-picker.sass */
 .chevron-left, #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected), .chevron-right, #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected) {
   position: relative; }
 
-/* line 191, admin-theme/_admin-date-range-picker.sass */
+/* line 166, admin-theme/_admin-date-range-picker.sass */
 .chevron-left:before, #datepicker .datepicker td.start-selected:not(.end-selected):not(.new):not(.old):before, .chevron-right:before, #datepicker .datepicker td.end-selected:not(.start-selected):not(.new):not(.old):before {
   display: block;
   content: "";
@@ -9100,7 +9079,7 @@ textarea {
   border-style: solid;
   position: absolute; }
 
-/* line 198, admin-theme/_admin-date-range-picker.sass */
+/* line 173, admin-theme/_admin-date-range-picker.sass */
 .chevron-left:before, #datepicker .datepicker td.start-selected:not(.end-selected):not(.new):not(.old):before {
   right: 0px;
   top: 0;
@@ -9108,7 +9087,7 @@ textarea {
   border-color: transparent transparent transparent #0d5373;
   background-color: #1275a1; }
 
-/* line 204, admin-theme/_admin-date-range-picker.sass */
+/* line 179, admin-theme/_admin-date-range-picker.sass */
 .chevron-right:before, #datepicker .datepicker td.end-selected:not(.start-selected):not(.new):not(.old):before {
   left: 0px;
   top: 0;
@@ -9116,7 +9095,7 @@ textarea {
   border-color: transparent transparent transparent #1275a1;
   background-color: #0d5373; }
 
-/* line 211, admin-theme/_admin-date-range-picker.sass */
+/* line 186, 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;
@@ -9125,21 +9104,21 @@ textarea {
   animation: one 0.2s ease-in-out; }
 
 @-webkit-keyframes one {
-  /* line 219, admin-theme/_admin-date-range-picker.sass */
+  /* line 194, admin-theme/_admin-date-range-picker.sass */
   0% {
     background-color: #1ba6e5; }
 
-  /* line 221, admin-theme/_admin-date-range-picker.sass */
+  /* line 196, admin-theme/_admin-date-range-picker.sass */
   100% {
     background-color: white; } }
 
 @-webkit-keyframes two {
-  /* line 225, admin-theme/_admin-date-range-picker.sass */
+  /* line 200, admin-theme/_admin-date-range-picker.sass */
   0% {
     -webkit-box-shadow: #1ba6e5 0 0 0 20px inset;
     box-shadow: #1ba6e5 0 0 0 20px inset; }
 
-  /* line 227, admin-theme/_admin-date-range-picker.sass */
+  /* line 202, admin-theme/_admin-date-range-picker.sass */
   100% {
     -webkit-box-shadow: #1ba6e5 0 0 0 inset;
     box-shadow: #1ba6e5 0 0 0 inset; } }
@@ -9620,13 +9599,14 @@ textarea {
   -webkit-backface-visibility: hidden;
   -moz-backface-visibility: hidden;
   backface-visibility: hidden;
+  width: 420px;
   position: absolute;
   top: 0;
   left: 0; }
-/* line 34, admin-theme/_admin-login.sass */
+/* line 35, admin-theme/_admin-login.sass */
 #login-panel .front {
   z-index: 2; }
-/* line 37, admin-theme/_admin-login.sass */
+/* line 38, admin-theme/_admin-login.sass */
 #login-panel .back {
   -webkit-transform: rotateY(180deg);
   -moz-transform: rotateY(180deg);
@@ -9634,7 +9614,7 @@ textarea {
   -o-transform: rotateY(180deg);
   transform: rotateY(180deg); }
 
-/* line 41, admin-theme/_admin-login.sass */
+/* line 42, admin-theme/_admin-login.sass */
 #login-footer a {
   color: #a0aab5; }
 
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 a4a625556..c98ae0f49 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass
@@ -38,3 +38,18 @@
 	li.active
 		a, a:hover
 			background-color: white
+
+.alert.alert-danger
+	padding-left: 60px
+	position: relative
+	&:before
+		content: "\f00d"
+		@extend .icon-remove
+		position: absolute
+		top: 0
+		left: 0
+
+.overflow-y
+	height: 200px
+	overflow-y: auto
+	
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 be627eed9..a727fad04 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
@@ -18,80 +18,55 @@ $color-calendar-range: darken($color-calendar,15%)
 		border: solid 3px $color-calendar-day-selected
 	#date-end.input-selected
 		border: solid 3px $color-calendar-day-selected
-	.datepickers-container
-		width: 60%
-		float: left
-		margin: 0
-		font-size: 16px
-		height: 16.8em
-	form#datepicker-form
-		width: 40%
-		float: left
-		+border-radius(0)
-		border: none
+	div#datepicker-form
 		#date-range .form-date-heading
-			background-color: darken($color-calendar-compare,5%)
+			background-color: darken($color-calendar,5%)
 		#date-compare .form-date-heading
 			background-color: darken($color-calendar-compare,5%)
 		.form-date-heading
-			font-family: $font-family
-			font-size: 1.15em
 			padding: 6px
-			color: $color-bright
-			font-weight: 200
-			text-transform: uppercase
+			.title, .checkbox-title label
+				font-family: $font-family
+				font-size: 1.15em
+				color: $color-bright
+				font-weight: 200
+				text-transform: uppercase
+				line-height: 2em
 			.btn-default
 				background-color: rgba($color-bright,0.3)
 				font-weight: 700
 				color: $color-bright
 				border: none
-		.form-date-body
-			padding: 10px
-		.form-date-group
-			+box-shadow(darken($color-calendar,30%) 0 0 4px)
-			background-color: $color-bright
+		.form-date-body, .form-date-actions
 			width: 100%
-			margin: 0 auto 6px auto
+			padding: 10px
+			background-color: white
+			display: inline-block
+		.form-date-group
+			width: 100%
+			margin: 0 auto
+			label
+				font-family: $font-family
+				font-size: 0.8em
+				font-weight: 700
+				text-transform: uppercase
+				color: #666
+				line-height: 3.2em
+				margin-bottom: 0
 			label, input
 				float: left
 				margin-right: 6px
-			label
-				line-height: 3.2em
-				font-weight: 700
-				font-size: 0.8em
-				margin-bottom: 0
 			input[type='text']
 				width: 35%
-		.actions
-			+box-shadow(darken($color-calendar,30%) 0 0 4px)
-			padding: 0
-			background-color: $color-calendar
-			.btn-primary
-				padding: 12px
-				text-transform:  uppercase
-				background-color: $color-bright
-				color: $color-calendar-day-selected
-				border: none
-			.btn-default
-				padding: 12px
-				text-transform:  uppercase
-				color: $color-calendar-day-selected
-				background: transparent
-				border: none
-		label
-			font-family: $font-family
-			font-weight: 700
-			text-transform: uppercase
-			color: #666
+
 	.datepicker
-		//+box-shadow(darken($color-calendar,30%) 0 0 4px)
 		position: relative
-		float: left
-		margin-right: 1%
-		width: 49%
-		height: 100%
+		margin: 0 0 8px 0
+		width: 100%
 		background-color: $color-calendar
 		font-family: $font-family
+		font-size: 14px
+		height: 16.8em
 		table
 			width: 100%
 			margin: 0
diff --git a/admin-dev/themes/default/css/admin-theme/_admin-login.sass b/admin-dev/themes/default/css/admin-theme/_admin-login.sass
index 7a9fb089e..701333b36 100644
--- a/admin-dev/themes/default/css/admin-theme/_admin-login.sass
+++ b/admin-dev/themes/default/css/admin-theme/_admin-login.sass
@@ -27,6 +27,7 @@
 
 	.front, .back
 		@include backface-visibility(hidden)
+		width: 420px
 		position: absolute
 		top: 0
 		left: 0
diff --git a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
index cff63d12e..f1b011eb2 100644
--- a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+++ b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl
@@ -1,21 +1,25 @@
 <div id="datepicker" class="datepicker-days">
-	<div class="row">
-		<div class="col-lg-8">
-			<div class="datepickers-container">
-				{if $is_rtl}
-				<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
-				<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>				
-				{else}
-				<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
-				<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
-				{/if}
-			</div>
+	<div class="row">	
+		{if $is_rtl}
+		<div class="col-sm-6 col-lg-4">
+			<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
 		</div>
-		<div class="col-lg-4">
-			<form class='form-inline' id='datepicker-form'>
-				<fieldset class='form-date-group' id='date-range'>
-					<div class='form-date-heading'>
-						{l s='Date range'}
+		<div class="col-sm-6 col-lg-4">
+			<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
+		</div>
+		{else}
+		<div class="col-sm-6 col-lg-4">
+			<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
+		</div>
+		<div class="col-sm-6 col-lg-4">
+			<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
+		</div>
+		{/if}
+		<div class="col-lg-4 clearfix">
+			<div id='datepicker-form' class='form-inline'>
+				<div id='date-range' class='form-date-group'>
+					<div  class='form-date-heading'>
+						<span class="title">{l s='Date range'}</span>
 						{if isset($actions) && $actions|count > 0}
 							{if $actions|count > 1}
 							<div class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown'>
@@ -32,39 +36,47 @@
 							{/if}
 						{/if}
 					</div>
-					<div class='form-date-body form-group'>
+					<div class='form-date-body'>
 						<label>{l s='From'}</label>
 						<input class='date-input form-control' id='date-start' placeholder='Start' type='text' name="date_from" value="{$date_from}" />
 						<label>{l s='to'}</label>
 						<input class='date-input form-control' id='date-end' placeholder='End' type='text' name="date_to" value="{$date_to}" />
 					</div>
-					<hr/>
-					<div class='form-date-heading'>
-						<div>{l s='Compare to'}</div>
+				</div>
+				<div id="date-compare" class='form-date-group'>
+					<div class='form-date-heading clearfix'>
+						<span class="checkbox-title">
+							<label >
+								<input type='checkbox'>
+								{l s='Compare to'}
+							</label>
+						</span>
+						<button class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown'>
+							Custom
+							<i class='icon-angle-down'></i>
+						</button>
+
 					</div>
-					<div class="form-date-body form-group">
+					<div class="form-date-body">
 						<label>{l s='From'}</label>
 						<input id="compare-date-start" class="date-input form-control" type="text" placeholder="Start" name="compare_date_from" value="{$compare_date_from}" />
 						<label>{l s='to'}</label>
 						<input id="compare-date-end" class="date-input form-control" type="text" placeholder="End" name="compare_date_to" value="{$compare_date_to}" />
 					</div>
-					<hr/>
-					<div class='form-group'>
-						<button class='btn btn-default' type='button'>
-							<i class='icon-remove text-danger'></i>
-							{l s='Cancel'}
-						</button>
-
-						<button class='btn btn-default' type='submit' name="submitDateRange">
-							<i class='icon-ok text-success'></i>
-							{l s='Apply'}
-						</button>
-					</div>
-				</fieldset>
-			</form>
+				</div>
+				<div class='form-date-actions'>
+					<button class='btn btn-default' type='button'>
+						<i class='icon-remove text-danger'></i>
+						{l s='Cancel'}
+					</button>
+					<button class='btn btn-default pull-right' type='submit' name="submitDateRange">
+						<i class='icon-ok text-success'></i>
+						{l s='Apply'}
+					</button>
+				</div>
+			</div>
 		</div>
 	</div>
-	<hr/>
 </div>
 <script type="text/javascript">
 	$(function() {