diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index 163f4c5b9d..0c5940630f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -3,6 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script language="JavaScript" type="text/javascript">
+//<![CDATA[
 	// Captura el evento onmousemove para cualquier navegador
 	if (document.layers) { // Netscape
 		document.captureEvents(Event.MOUSEMOVE);
@@ -107,6 +108,7 @@
 	function Help() {
 		newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 	}
+//]]>
 </script>
 
 <style type="text/css">
@@ -153,7 +155,19 @@
 	width : 500px;
 	display : none;
 	border : 1px solid #000000;
-	padding : 0px;
+	padding : 3px;
+	position: absolute;
+	background-color: #CCCCCC;
+}
+
+div.dmy {
+	display:inline;
+}
+
+.blacklabel, div.dmy input {
+	background-color:#FFFFFF;
+	color:Black;
+	font-size:10px;
 }
 
 </style>
@@ -176,32 +190,29 @@
 <!-- **************************************************************************************** -->
 
 <!-- ********************** Panel for showing already loaded holidays *********************** -->
-<div class="panel" style="position:absolute;background-color:#CCCCCC" id="showHoliday">
+<div class="panel" id="showHoliday">
  	<form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post">
-		<p onclick=" hidePanel('showHoliday');hidePanel('information')" style="cursor:pointer">
-			Hide Details
-			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/signClose.gif" border="0" alt="" style="vertical-align:middle" />
+		<h2>Edit this holiday</h2>
+		<p>
+			<label for="showBranchName">Library</label>
+			<input type="text" size="20" id="showBranchName" name="showBranchName" readonly="readonly" class="blacklabel" />
 		</p>
 		<p>
 			<label for="showDayname">Day name</label>
-			<input type="text" size="20" id="showDayname" name="showDayname" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
+			<input type="text" size="20" id="showDayname" name="showDayname" readonly="readonly" class="blacklabel" />
 			<input type="hidden" name="showWeekday" />
 		</p>
-		<p>
-			<label for="showBranchName">Library</label>
-			<input type="text" size="20" id="showBranchName" name="showBranchName" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-		</p>
-		<div style="display:inline">
-			<label for="showDay">Day</label> <input type="text" size="2" id="showDay" name="showDay" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-			<label for="showMonth">Month</label> <input type="text" size="2" id="showMonth" name="showMonth" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-			<label for="showYear">Year</label> <input type="text" size="4" id="showYear" name="showYear" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />		
+		<div class="dmy">
+			<label for="showDay">Day</label> <input type="text" size="2" id="showDay" name="showDay" readonly="readonly" />
+			<label for="showMonth">Month</label> <input type="text" size="2" id="showMonth" name="showMonth" readonly="readonly" />
+			<label for="showYear">Year</label> <input type="text" size="4" id="showYear" name="showYear" readonly="readonly" />		
 		</div>
-	    <p><label for="showDescription">Add a description to holiday day</label></p>
-		<p>
+	    <p><label for="showDescription">Description:</label>
+			<br />
 			<textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>	
 		</p>
 		<div id="exceptionPosibility" style="position:static">
-			<input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception to this holiday</label>
+			<input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception to this holiday.</label>
 			<a href="#" onclick=" additionalInformation('You can make an exception for this holiday rule. This means that you will be able to say for a repeatable holiday, that there is one of those days that is going to be an exception.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
 		</div>
 		<input type="radio" name="showOperationDel" value="delete" checked="checked" /> <label for="showOperationDel">Delete this holiday</label>.
@@ -214,37 +225,38 @@
 </div>
 
 <!-- ***************************** Panel to deal with new holidays **********************  -->
-<div class="panel" style="position:absolute;background-color:#CCCCCC" id="newHoliday">
+<div class="panel" id="newHoliday">
  	<form action="/cgi-bin/koha/tools/newHolidays.pl" method="post">
-		<h2>
-			Add new holiday
-		</h2>
-		<p>
-			<label for="newDayname">Day name</label>
-			<input type="text" size="20" id="newDayname" name="newDayname" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-			<input type="hidden" name="newWeekday" />
-		</p>
+		<h2>Add new holiday</h2>
 		<p>
 			<label for="newBranchName">Library</label>
-			<input type="text" size="20" id="newBranchName" name="newBranchName" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
+			<input type="text" size="20" id="newBranchName" name="newBranchName" readonly="readonly" class="blacklabel" />
 		</p>
-		<div style="display:inline">
-			<label for="newDay">Day</label> <input type="text" size="2" id="newDay" name="newDay" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-			<label for="newMonth">Month</label> <input type="text" size="2" id="newMonth" name="newMonth"  readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-			<label for="newYear">Year</label> <input type="text" size="4" id="newYear" name="newYear" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
-		</div>
 		<p>
-			<label for="newDescription">Add a description to holiday day</label>
+			<label for="newDayname">Day name</label>
+			<input type="text" size="20" id="newDayname" name="newDayname" readonly="readonly" class="blacklabel" />
+			<input type="hidden" name="newWeekday" />
+		</p>
+		<div class="dmy">
+			<label for="newDay">Day</label> <input type="text" size="2" id="newDay" name="newDay" readonly="readonly" />
+			<label for="newMonth">Month</label> <input type="text" size="2" id="newMonth" name="newMonth"  readonly="readonly" />
+			<label for="newYear">Year</label> <input type="text" size="4" id="newYear" name="newYear" readonly="readonly" />
+		</div>
+		<p><label for="newDescription">Description:</label>
+			<br />
 			<textarea rows="2" cols="40" id="newDescription" name="newDescription"></textarea>
 		</p>
-			<input type="radio" name="newOperation" id="newOperationOnce" value="holiday" checked="checked" /> <label for="newOperationOnce">Holiday only on this day</label>.
-			<a href="#" onclick=" additionalInformation('This will take this date to make it holiday just for this time. Through this option, you can set a single holiday. For example, suppose you are in August 1st, and only for this year you want to make it holiday.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
+			<input type="radio" name="newOperation" id="newOperationOnce" value="holiday" checked="checked" />
+			<label for="newOperationOnce">Holiday only on this day</label>.
+			<a href="#" onclick=" additionalInformation('Make a single holiday. For example, selecting August 1st, 2012 will make it holiday, but will not affect August 1st in other years.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
 			<br />
-			<input type="radio" name="newOperation" id="newOperationDay" value="weekday" /> <label for="newOperationDay">Holiday repeated every same day of the week</label>
-			<a href="#" onclick=" additionalInformation('This will take this week day and make it holiday. No matter what date it is, this option will repeat this rule for every week. For example, if this date correspond to a saturday, every saturdays will be holidays.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
+			<input type="radio" name="newOperation" id="newOperationDay" value="weekday" />
+			<label for="newOperationDay">Holiday repeated every same day of the week</label>.
+			<a href="#" onclick=" additionalInformation('Make this weekday a holiday, every week. For example, if your library is closed on Saturdays, use this option to make every Saturday a holiday.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
 			<br />
-			<input type="radio" name="newOperation" id="newOperationYear" value="repeatable" /><label for="newOperationYear">Holiday repeated yearly on the same date</label>.
-			<a href="#" onclick=" additionalInformation('This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, if this date correspond to a August 1st, every August 1st will be holiday, no matter what year you are.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
+			<input type="radio" name="newOperation" id="newOperationYear" value="repeatable" />
+			<label for="newOperationYear">Holiday repeated yearly on the same date</label>.
+			<a href="#" onclick=" additionalInformation('This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
 			<p>
 				<input type="submit" name="submit" value="Save" />
 				<input type="button" name="cancel2" value="Cancel" onclick=" hidePanel('newHoliday');hidePanel('information')" />
@@ -252,13 +264,10 @@
  	</form>
 </div>
 
-
 <!-- *************************************************************************************** -->
 <!-- ******                          END OF FLAT PANELS                               ****** -->
 <!-- *************************************************************************************** -->
 
-
-
 <!-- *************************************************************************************** -->
 <!-- ******                     START OF INFORMATION PANEL                            ****** -->
 <!-- *************************************************************************************** -->
@@ -280,8 +289,6 @@
 <!-- ******                      END OF INFORMATION PANEL                            ****** -->
 <!-- ************************************************************************************** -->
 
-
-
 <h1>Define the holidays for branch <!-- TMPL_VAR name="BRANCHES" --></h1>
 	<ul>
 		<li>Search in the calendar the day you want to set as holiday.</li>