diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index 799b50e0d..558b1f23f 100644
--- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -37,7 +37,47 @@
 			{if $warning}
 				<div class="alert alert-warning">{$warning}</div>
 			{/if}	
-			{include file="../../../../form_date_range_picker.tpl"}
+			<div id="calendar" class="panel">
+				<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
+					<div class="row">
+						<div class="col-lg-6">
+							<div class="btn-group">
+								<button type="button" name="submitDateDay" class="btn btn-default submitDateDay" onclick="setDayPeriod()">{$translations.Day}</button>
+								<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth" onclick="setMonthPeriod()">{$translations.Month}</button>
+								<button type="button" name="submitDateYear" class="btn btn-default submitDateYear" onclick="setYearPeriod()">{$translations.Year}</button>
+								<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" onclick="setPreviousDayPeriod()">{$translations.Day}-1</button>
+								<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" onclick="setPreviousMonthPeriod()">{$translations.Month}-1</button>
+								<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" onclick="setPreviousYearPeriod()">{$translations.Year}-1</button>
+							</div>
+						</div>
+						<div class="col-lg-6">
+							<div class="row">
+								<div class="col-md-8">
+									<div class="row">
+										<div class="col-xs-6">
+											<div class="input-group">
+												<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
+												<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
+											</div>
+										</div>
+										<div class="col-xs-6">
+											<div class="input-group">
+												<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
+												<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-lg-12">
+							{$calendar}
+						</div>
+					</div>
+				</form>	
+			</div>
 		</div>
 	</div>
 	<div class="row">
@@ -87,3 +127,16 @@
 		</div>
 	</div>
 </div>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$('#datepickerFrom').click(function() {
+			$('#datepicker').slideDown(200);
+			$('#date-start').focus();
+		});
+
+		$('#datepickerTo').click(function() {
+			$('#datepicker').slideDown(200);
+			$('#date-end').focus();
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/form_date_range_picker.tpl b/admin-dev/themes/default/template/form_date_range_picker.tpl
index 367f6a177..f75864be5 100644
--- a/admin-dev/themes/default/template/form_date_range_picker.tpl
+++ b/admin-dev/themes/default/template/form_date_range_picker.tpl
@@ -3,12 +3,12 @@
 		<div class="row">
 			<div class="col-lg-6">
 				<div class="btn-group">
-					<button type="button" name="submitDateDay" class="btn btn-default submitDateDay" onclick="setDayPeriod()">{$translations.Day}</button>
-					<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth" onclick="setMonthPeriod()">{$translations.Month}</button>
-					<button type="button" name="submitDateYear" class="btn btn-default submitDateYear" onclick="setYearPeriod()">{$translations.Year}</button>
-					<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" onclick="setPreviousDayPeriod()">{$translations.Day}-1</button>
-					<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" onclick="setPreviousMonthPeriod()">{$translations.Month}-1</button>
-					<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" onclick="setPreviousYearPeriod()">{$translations.Year}-1</button>
+					<button type="submit" name="submitDateDay" class="btn btn-default submitDateDay">{$translations.Day}</button>
+					<button type="submit" name="submitDateMonth" class="btn btn-default submitDateMonth">{$translations.Month}</button>
+					<button type="submit" name="submitDateYear" class="btn btn-default submitDateYear">{$translations.Year}</button>
+					<button type="submit" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev">{$translations.Day}-1</button>
+					<button type="submit" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev">{$translations.Month}-1</button>
+					<button type="submit" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev">{$translations.Year}-1</button>
 				</div>					
 			</div>
 			<div class="col-lg-6">
@@ -18,37 +18,34 @@
 							<div class="col-xs-6">
 								<div class="input-group">
 									<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
-									<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control">
+									<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker  form-control">
 								</div>
 							</div>
 							<div class="col-xs-6">
 								<div class="input-group">
 									<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
-									<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="form-control">
+									<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker  form-control">
 								</div>
 							</div>
 						</div>
 					</div>
+					<div class="col-md-4">
+						<div class="row">
+							<button type="submit" name="submitDatePicker" id="submitDatePicker" class="btn btn-default"><i class="icon-save"></i> {l s='Save'}</button>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
-		<div class="row">
-			<div class="col-lg-12">
-				{$calendar}
-			</div>
-		</div>
-	</form>	
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$('#datepickerFrom').click(function() {
-				$('#datepicker').slideDown(200);
-				$('#date-start').focus();
+	</form>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() {
+		if ($("form#calendar_form .datepicker").length > 0)
+			$("form#calendar_form .datepicker").datepicker({
+				prevText: '',
+				nextText: '',
+				dateFormat: 'yy-mm-dd'
 			});
-
-			$('#datepickerTo').click(function() {
-				$('#datepicker').slideDown(200);
-				$('#date-end').focus();
-			});
-		});
-	</script>
-</div>
\ No newline at end of file
+	});
+</script>
\ No newline at end of file