diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index b582c9cede..f206a389f9 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -132,15 +132,11 @@ else {
 	//basic search of call detail records
 		if (permission_exists('xml_cdr_search')) {
 
-			// javascript calendar (source: http://rightjs.org)
-			echo "<script type='text/javascript' src='".PROJECT_PATH."/resources/rightjs/right.js'></script>";
-			echo "<script type='text/javascript' src='".PROJECT_PATH."/resources/rightjs/right-calendar-src.js'></script>";
-
 			echo "<form method='post' action=''>\n";
 
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
-			echo "<td width='25%' style='vertical-align: top;'>\n";
+			echo "<td width='33%' style='vertical-align: top;'>\n";
 
 				echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
 				echo "	<tr>\n";
@@ -223,7 +219,7 @@ else {
 				echo "</table>\n";
 
 			echo "</td>";
-			echo "<td width='25%' style='vertical-align: top;'>\n";
+			echo "<td width='33%' style='vertical-align: top;'>\n";
 
 				echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
 				echo "	<tr>\n";
@@ -246,7 +242,7 @@ else {
 				echo "</table>\n";
 
 			echo "</td>";
-			echo "<td width='25%' style='vertical-align: top;'>\n";
+			echo "<td width='34%' style='vertical-align: top;'>\n";
 
 				echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
 				echo "	<tr>\n";
@@ -254,9 +250,9 @@ else {
 				echo "			".$text['label-start_range']."\n";
 				echo "		</td>\n";
 				echo "		<td class='vtable' width='70%' align='left' style='white-space: nowrap;'>\n";
-				echo "			<input type='text' class='formfld' name='start_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_begin'>\n";
+				echo "			<input type='text' class='formfld' style='min-width: 115px;' name='start_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_begin'>\n";
 				echo "			> ";
-				echo "			<input type='text' class='formfld' name='start_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_end'>\n";
+				echo "			<input type='text' class='formfld' style='min-width: 115px;' name='start_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_end'>\n";
 				echo "		</td>\n";
 				echo "	</tr>\n";
 				echo "	<tr>\n";
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index d1379a8926..de634c2a4d 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -48,10 +48,6 @@ echo "<tr class='border'>\n";
 echo "	<td align=\"left\">\n";
 echo "		<br>";
 
-// javascript calendar (source: http://rightjs.org)
-echo "<script type='text/javascript' src='".PROJECT_PATH."/resources/rightjs/right.js'></script>";
-echo "<script type='text/javascript' src='".PROJECT_PATH."/resources/rightjs/right-calendar-src.js'></script>";
-
 echo "<form method='post' action='xml_cdr.php'>\n";
 echo "<table width='100%' cellpadding='6' cellspacing='0'>\n";
 
@@ -111,25 +107,25 @@ echo "	</tr>";
 echo "	<tr>";
 echo "		<td class='vncell'>".$text['label-start_range']."</td>";
 echo "		<td class='vtable'>";
-echo "			<input type='text' class='formfld' name='start_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_begin'>";
+echo "			<input type='text' class='formfld' style='min-width: 115px;' name='start_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_begin'>";
 echo "			> ";
-echo "			<input type='text' class='formfld' name='start_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_end'>";
+echo "			<input type='text' class='formfld' style='min-width: 115px;' name='start_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$start_stamp_end'>";
 echo "		</td>";
 echo "	</tr>";
 echo "	<tr>";
 echo "		<td class='vncell'>".$text['label-answer_range']."</td>";
 echo "		<td class='vtable'>";
-echo "			<input type='text' class='formfld' name='answer_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$answer_stamp_begin'>";
+echo "			<input type='text' class='formfld' style='min-width: 115px;' name='answer_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$answer_stamp_begin'>";
 echo "			> ";
-echo "			<input type='text' class='formfld' name='answer_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$answer_stamp_end'>";
+echo "			<input type='text' class='formfld' style='min-width: 115px;' name='answer_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$answer_stamp_end'>";
 echo "		</td>";
 echo "	</tr>";
 echo "	<tr>";
 echo "		<td class='vncell'>".$text['label-end_range']."</td>";
 echo "		<td class='vtable'>";
-echo "			<input type='text' class='formfld' name='end_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$end_stamp_begin'>";
+echo "			<input type='text' class='formfld' style='min-width: 115px;' name='end_stamp_begin' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$end_stamp_begin'>";
 echo "			> ";
-echo "			<input type='text' class='formfld' name='end_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$end_stamp_end'>";
+echo "			<input type='text' class='formfld' style='min-width: 115px;' name='end_stamp_end' data-calendar=\"{format: '%Y-%m-%d %H:%M', listYears: true, hideOnPick: false, fxName: null, showButtons: true}\" value='$end_stamp_end'>";
 echo "		</td>";
 echo "	</tr>";
 echo "	<tr>";
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 513611bd72..9cd5987b7a 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -927,11 +927,19 @@ legend {
 	//-->
 </SCRIPT>
 
-<script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.8.3.js"></script>
-<script language="javascript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery.autosize.input.js"></script>
+<!-- // javascript calendar (source: http://rightjs.org) - keep before jquery load -->
+<script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right.js'></script>
+<script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right-calendar-src.js'></script>
+
+<script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.8.3.js"></script>
+<script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery.autosize.input.js"></script>
 <script language="JavaScript" type="text/javascript">
 	$(document).ready(function() {
 
+		$("#domains_show_icon").click(function() { show_domains(); });
+		$("#domains_show_text").click(function() { show_domains(); });
+		$("#domains_hide").click(function() { hide_domains(); });
+
 		function show_domains() {
 			$("#domains_container").show();
 			$("#domains_block").animate({marginRight: '+=300'}, 400);
@@ -950,14 +958,6 @@ legend {
 			document.getElementById('domains_visible').value = 0;
 		}
 
-		$("#domains_show_icon, #domains_show_text").click(function() {
-			show_domains();
-		});
-
-		$("#domains_hide").click(function() {
-			hide_domains();
-		});
-
 		// hit escape to toggle visibility of domain selector
 		$(document).keyup(function(e) {
 			if (e.keyCode == 27 && document.getElementById('domains_visible').value == 0) {