diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less
index 52ebdf6ab..6844c25df 100644
--- a/src/main/less/cheapy.less
+++ b/src/main/less/cheapy.less
@@ -56,7 +56,7 @@
 
 .table-filter {
   background-color: @spring-brown;
-  padding: 9px 12px;
+  padding: 5px 12px;
 }
 
 .nav > li > a {
@@ -298,18 +298,23 @@ img.img-responsive{
 
 #foodOfferTable th {
   width: 25%;
+  text-align: center;
+  
 }
 
 #nuOfferTable th {
-  width: 33%;
+  width: 25%;
+text-align: center;
 }
 
 #speedOfferTable th {
-  width: 33%;
+  width: 25%;
+text-align: center;
 }
 
 #timeOfferTable th {
-  width: 33%;
+  width: 25%;
+text-align: center;
 }
 
 .btn-detalles button {
@@ -401,18 +406,38 @@ img.img-responsive{
 
 #foodOfferTable td{
   vertical-align:middle;
+text-align: center;
 }
 
 #nuOfferTable td{
   vertical-align:middle;
+text-align: center;
 }
 
 #speedOfferTable td{
   vertical-align:middle;
+text-align: center;
 }
 
 #timeOfferTable td{
   vertical-align:middle;
+text-align: center;
+}
+
+#nuOffer-table th{
+	text-align: center;
+}
+
+#nuOffer-table td{
+	text-align: center;
+}
+
+#speedOffer-table th{
+	text-align: center;
+}
+
+#speedOffer-table td{
+	text-align: center;
 }
 
 #nuOffer-table tr:nth-child(3){
diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties
index 52ca403e5..c93d14f77 100644
--- a/src/main/resources/messages/messages_es.properties
+++ b/src/main/resources/messages/messages_es.properties
@@ -5,10 +5,10 @@ cancel=Cancelar
 deleteOfferMessage=Confirme que quiere eliminar su oferta
 listOffers=Ver Ofertas
 createOffers=Crear Ofertas
-foodOffers=Ofertas por plato específico
-foodOffer=Oferta por plato específico
-nuOffers=Ofertas por número de comensales
-nuOffer=Oferta por número de comensales
+foodOffers=Ofertas por plato espec�fico
+foodOffer=Oferta por plato espec�fico
+nuOffers=Ofertas por n�mero de comensales
+nuOffer=Oferta por n�mero de comensales
 speedOffers=Ofertas rapidez comiendo
 speedOffer=Oferta por comer veloz
 timeOffers=Ofertas por franja horaria
@@ -28,16 +28,18 @@ offerBeginning=Inicio de la oferta
 endDate=Fecha fin
 offerEnding=Fin de la oferta
 details=Detalles
-offerCode=Código de la oferta
+offerCode=C�digo de la oferta
 return=Volver
 required=Es requerido Ofertas por franja horaria
 notFound=No ha sido encontrado
 duplicate=Ya se encuentra en uso
-nonNumeric=Sólo debe contener números
-duplicateFormSubmission=No se permite el envío de formularios duplicados
-typeMismatch.date=Fecha inválida
-typeMismatch.birthDate=Fecha inválida
-createFoodOffers= Crear ofertas por plato específico
-createNuOffers= Crear ofertas por número de comensales
+nonNumeric=S�lo debe contener n�meros
+duplicateFormSubmission=No se permite el env�o de formularios duplicados
+typeMismatch.date=Fecha inv�lida
+typeMismatch.birthDate=Fecha inv�lida
+createFoodOffers= Crear ofertas por plato espec�fico
+createNuOffers= Crear ofertas por n�mero de comensales
 createSpeedOffers= Crear ofertas por rapidez comiendo
-createTimeOffers= Crear ofertas por franja horaria
\ No newline at end of file
+createTimeOffers= Crear ofertas por franja horaria
+init= Inicio del intervalo
+finish= Fin del intervalo
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp
index b5e5dcfaa..a2366158e 100644
--- a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp
@@ -4,10 +4,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
-<petclinic:layout pageName="foodOffers">
+<cheapy:layout pageName="foodOffers">
     <h2 style="text-align:center;padding:5px">
         <c:if test="${foodOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="foodOffer"/>
     </h2>
@@ -16,10 +16,10 @@
         	<form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
-            <petclinic:inputField label="Fecha de Fin" placeholder="dd/MM/yyyy HH:mm" name="end"/>
-            <petclinic:inputField label="Plato" placeholder="Ej. Macarrones" name="food"/>
-            <petclinic:inputField label="Descuento" placeholder="Ej. 50" name="discount"/>
+            <cheapy:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
+            <cheapy:inputField label="Fecha de Fin" placeholder="dd/MM/yyyy HH:mm" name="end"/>
+            <cheapy:inputField label="Plato" placeholder="Ej. Macarrones" name="food"/>
+            <cheapy:inputField label="Descuento" placeholder="Ej. 50" name="discount"/>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
@@ -40,4 +40,16 @@
             </div>
         </div>
     </form:form>
-</petclinic:layout>
+    
+    <div class="btn-return">
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+		    <fmt:message key="return"/> </button>
+	</div>
+   	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
+	
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp
index 211212e0c..36ff24281 100644
--- a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp
@@ -29,7 +29,7 @@
         </tr>
         <tr>
             <th><fmt:message key="discount"/></th>
-            <td><c:out value="${foodOffer.discount}"/> </td>
+            <td><c:out value="${foodOffer.discount}%"/> </td>
         </tr>
 
         <tr>
@@ -41,7 +41,7 @@
     
     <div class="btn-menu">
 	    <div class="btn-return">
-		    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
 		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
 		    <fmt:message key="return"/> </button>
 	    </div>
@@ -63,4 +63,10 @@
 	    </div>
     </div>
 	
+	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
+	
 </cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 89f886557..aee0598c1 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -296,10 +296,10 @@
 		  <input type="submit" class="fadeIn fourth" value="Iniciar sesión">
 	    </form>
 	
-	    <!-- Remind Passowrd -->
+	    <!-- Remind Passowrd
 	    <div id="formFooter">
 	      <a class="underlineHover" href="#">Forgot Password?</a>
-	    </div>
+	    </div> -->
 	
 	  </div>
 	</div>    
diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp
index 352522764..d693e8ae9 100644
--- a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp
@@ -4,10 +4,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
-<petclinic:layout pageName="NumOffers">
+<cheapy:layout pageName="NumOffers">
     <h2 style="text-align:center;padding:5px">
         <c:if test="${nuOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="nuOffer"/>
     </h2>
@@ -16,15 +16,15 @@
             <form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
-            <petclinic:inputField label="Fecha de Fin"  placeholder="dd/MM/yyyy HH:mm" name="end"/>
+            <cheapy:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
+            <cheapy:inputField label="Fecha de Fin"  placeholder="dd/MM/yyyy HH:mm" name="end"/>
             
-            <petclinic:inputField label="Número de comensales (nivel Oro)" placeholder="XX (Ej. 6)" name="gold"/>
-            <petclinic:inputField label="Descuento de nivel oro" placeholder="XX% (Ej. 30)" name="discountGold"/>
-            <petclinic:inputField label="Número de comensales (nivel Plata)" placeholder="XX (Ej. 4)" name="silver"/>
-            <petclinic:inputField label="Descuento de plata" placeholder="XX% (Ej. 15)" name="discountSilver"/>
-            <petclinic:inputField label="Número de comensales (nivel Bronce)" placeholder="XX (Ej. 2)" name="bronze"/>
-			<petclinic:inputField label="Descuento de bronce" placeholder="XX% (Ej. 5)" name="discountBronze"/>
+            <cheapy:inputField label="Número de comensales (nivel Oro)" placeholder="XX (Ej. 6)" name="gold"/>
+            <cheapy:inputField label="Descuento de nivel oro" placeholder="XX% (Ej. 30)" name="discountGold"/>
+            <cheapy:inputField label="Número de comensales (nivel Plata)" placeholder="XX (Ej. 4)" name="silver"/>
+            <cheapy:inputField label="Descuento de plata" placeholder="XX% (Ej. 15)" name="discountSilver"/>
+            <cheapy:inputField label="Número de comensales (nivel Bronce)" placeholder="XX (Ej. 2)" name="bronze"/>
+			<cheapy:inputField label="Descuento de bronce" placeholder="XX% (Ej. 5)" name="discountBronze"/>
 
             </div>
         <div class="form-group">
@@ -46,4 +46,16 @@
             </div>
         </div>
     </form:form>
-</petclinic:layout>
+    
+    <div class="btn-return">
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+		    <fmt:message key="return"/> </button>
+	</div>
+   	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
+	
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp
index 565d2bd43..af8ceb975 100644
--- a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp
@@ -22,27 +22,27 @@
         </tr>
         <tr>
             <th><fmt:message key="goldGoal"/></th>
-            <td><c:out value="${nuOffer.gold}"/></td>
+            <td><c:out value="${nuOffer.gold} comensales" /></td>
         </tr>
         <tr>
             <th><fmt:message key="goldDiscount"/></th>
-            <td><c:out value="${nuOffer.discountGold}"/></td>
+            <td><c:out value="${nuOffer.discountGold}%"/></td>
         </tr>
         <tr>
             <th><fmt:message key="silverGoal"/></th>
-            <td><c:out value="${nuOffer.silver}"/></td>
+            <td><c:out value="${nuOffer.silver} comensales"/></td>
         </tr>
         <tr>
             <th><fmt:message key="silverDiscount"/></th>
-            <td><c:out value="${nuOffer.discountSilver}"/></td>
+            <td><c:out value="${nuOffer.discountSilver}%"/></td>
         </tr>
         <tr>
             <th>Meta bronce</th>
-            <td><c:out value="${nuOffer.bronze}"/></td>
+            <td><c:out value="${nuOffer.bronze} comensales"/></td>
         </tr>
         <tr>
             <th><fmt:message key="bronzeDiscount"/></th>
-            <td><c:out value="${nuOffer.discountBronze}"/></td>
+            <td><c:out value="${nuOffer.discountBronze}%"/></td>
         </tr>
         <tr>
             <th><fmt:message key="offerCode"/></th>
@@ -52,7 +52,7 @@
     
     <div class="btn-menu">
 	    <div class="btn-return">
-		    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
 		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
 		    <fmt:message key="return"/> </button>
 	    </div>
@@ -74,4 +74,10 @@
 	    </div>
     </div>
 
+	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
+
 </cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp
index 51fc8d8b1..d0b418471 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp
@@ -33,4 +33,14 @@
 	   	</div>
 		   	
    	</div>
+   	<div class="btn-return">
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+		    <fmt:message key="return"/> </button>
+	</div>
+   	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
 </cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
index 30ee72a07..baa17bde9 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
@@ -14,6 +14,7 @@
         <tr>
         	<!-- <th style="width: 150px;">Restaurante</th> -->
         	<th><fmt:message key="food"/></th>
+        	<th><fmt:message key="discount"/></th>
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
             <th> </th>
@@ -25,6 +26,9 @@
                 <td>
                     <c:out value="${foodOffer.food}"/>
                 </td>
+                <td>
+                    <c:out value="${foodOffer.discount}%"/>
+                </td>
                 <td>
                     <c:out value="${localDateTimeFormat.format(foodOffer.start)}"/>
                 </td>
@@ -55,6 +59,8 @@
         	<!-- <th style="width: 150px;">Restaurante</th> -->
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
+            <th><fmt:message key="goldGoal"/></th>
+            <th><fmt:message key="goldDiscount"/></th>
             <th> </th>
             
         </tr>
@@ -69,6 +75,12 @@
                 <td>
                     <c:out value="${localDateTimeFormat.format(nuOffer.end)}"/>
                 </td>
+                <td>
+                    <c:out value="${nuOffer.gold} comensales"/>
+                </td>
+                <td>
+                    <c:out value="${nuOffer.discountGold}%"/>
+                </td>
                 <td>
 	                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
 	                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
@@ -91,6 +103,8 @@
         	<!-- <th style="width: 150px;">Restaurante</th> -->
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
+            <th><fmt:message key="goldGoal"/></th>
+            <th><fmt:message key="goldDiscount"/></th>
             <th> </th>
             
         </tr>
@@ -105,6 +119,12 @@
                 <td>
                     <c:out value="${localDateTimeFormat.format(speedOffer.end)}"/>
                 </td>
+                <td>
+                    <c:out value="${speedOffer.gold} minutos"/>
+                </td>
+                <td>
+                    <c:out value="${speedOffer.discountGold}%"/>
+                </td>
                 <td>
                     <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
                         <spring:param name="speedOfferId" value="${speedOffer.id}"/>
@@ -128,6 +148,8 @@
         	<!-- <th style="width: 150px;">Restaurante</th> -->
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
+            <th><fmt:message key="init"/></th>
+            <th><fmt:message key="finish"/></th>
             <th> </th>
         </tr>
         </thead>
@@ -141,6 +163,13 @@
                 <td>
                     <c:out value="${localDateTimeFormat.format(timeOffer.end)}"/>
                 </td>
+                <td>
+                    <c:out value="${timeOffer.init}h"/>
+                </td>
+                <td>
+                    <c:out value="${timeOffer.finish}h"/>
+                </td>
+                
                 <td>
                 	<spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
                         <spring:param name="timeOfferId" value="${timeOffer.id}"/>
@@ -155,4 +184,14 @@
         </c:forEach>
         </tbody>
     </table>
+    <div class="btn-return">
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+		    <fmt:message key="return"/> </button>
+	</div>
+    <script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
 </cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp
index 8f76164d5..d466bc2f5 100644
--- a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp
@@ -4,10 +4,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
-<petclinic:layout pageName="speedOffers">
+<cheapy:layout pageName="speedOffers">
     <h2 style="text-align:center;padding:5px">
         <c:if test="${speedOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="speedOffer"/>
     </h2>
@@ -16,14 +16,14 @@
             <form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
-            <petclinic:inputField label="Fecha de Fin"  placeholder="dd/MM/yyyy HH:mm" name="end"/>
-            <petclinic:inputField label="Tiempo para comer (nivel Oro)" placeholder="XX minutos (Ej. 5)" name="gold"/>
-            <petclinic:inputField label="Descuento nivel Oro" placeholder="XX% (Ej. 35)" name="discountGold"/>
-            <petclinic:inputField label="Tiempo para comer (nivel Plata)" placeholder="XX minutos (Ej. 10)" name="silver"/>
-            <petclinic:inputField label="Descuento nivel Plata" placeholder="XX% (Ej. 15)" name="discountSilver"/>
-            <petclinic:inputField label="Tiempo para comer (nivel Bronce)" placeholder="XX minutos (Ej. 20)" name="bronze"/>
-            <petclinic:inputField label="Descuento nivel Bronce" placeholder="XX% (Ej. 5)" name="discountBronze"/>
+            <cheapy:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
+            <cheapy:inputField label="Fecha de Fin"  placeholder="dd/MM/yyyy HH:mm" name="end"/>
+            <cheapy:inputField label="Tiempo para comer (nivel Oro)" placeholder="XX minutos (Ej. 5)" name="gold"/>
+            <cheapy:inputField label="Descuento nivel Oro" placeholder="XX% (Ej. 35)" name="discountGold"/>
+            <cheapy:inputField label="Tiempo para comer (nivel Plata)" placeholder="XX minutos (Ej. 10)" name="silver"/>
+            <cheapy:inputField label="Descuento nivel Plata" placeholder="XX% (Ej. 15)" name="discountSilver"/>
+            <cheapy:inputField label="Tiempo para comer (nivel Bronce)" placeholder="XX minutos (Ej. 20)" name="bronze"/>
+            <cheapy:inputField label="Descuento nivel Bronce" placeholder="XX% (Ej. 5)" name="discountBronze"/>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
@@ -44,4 +44,16 @@
             </div>
         </div>
     </form:form>
-</petclinic:layout>
+    
+    <div class="btn-return">
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+		    <fmt:message key="return"/> </button>
+	</div>
+   	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
+	
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp
index 8659f8097..85a81a438 100644
--- a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp
@@ -22,27 +22,27 @@
         </tr>
         <tr>
             <th><fmt:message key="goldGoal"/></th>
-            <td><c:out value="${speedOffer.gold}"/></td>
+            <td><c:out value="${speedOffer.gold} minutos"/></td>
         </tr>
         <tr>
             <th><fmt:message key="goldDiscount"/></th>
-            <td><c:out value="${speedOffer.discountGold}"/></td>
+            <td><c:out value="${speedOffer.discountGold}%"/></td>
         </tr>
         <tr>
             <th><fmt:message key="silverGoal"/></th>
-            <td><c:out value="${speedOffer.silver}"/></td>
+            <td><c:out value="${speedOffer.silver} minutos"/></td>
         </tr>
         <tr>
             <th><fmt:message key="silverDiscount"/></th>
-            <td><c:out value="${speedOffer.discountSilver}"/></td>
+            <td><c:out value="${speedOffer.discountSilver}%"/></td>
         </tr>
         <tr>
             <th><fmt:message key="bronzeGoal"/></th>
-            <td><c:out value="${speedOffer.bronze}"/></td>
+            <td><c:out value="${speedOffer.bronze} minutos"/></td>
         </tr>
         <tr>
             <th><fmt:message key="bronzeDiscount"/></th>
-            <td><c:out value="${speedOffer.discountBronze}"/></td>
+            <td><c:out value="${speedOffer.discountBronze}%"/></td>
         </tr>
         <tr>
             <th><fmt:message key="offerCode"/></th>
@@ -52,7 +52,7 @@
     
     <div class="btn-menu">
 	    <div class="btn-return">
-		    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
 		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
 		    <fmt:message key="return"/> </button>
 	    </div>
@@ -73,6 +73,11 @@
 	        Desactivar oferta</button>
 	    </div>
     </div>
-
+	
+	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
 
 </cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp
index 82d748b3a..bc8c6fde5 100644
--- a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp
@@ -4,10 +4,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
-<petclinic:layout pageName="TimeOffers">
+<cheapy:layout pageName="TimeOffers">
     <h2 style="text-align:center;padding:5px">
         <c:if test="${timeOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="timeOffer"/>
     </h2>
@@ -16,12 +16,12 @@
         	<form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Fecha de inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
-            <petclinic:inputField label="Fecha de fin" placeholder="dd/MM/yyyy HH:mm" name="end"/>
+            <cheapy:inputField label="Fecha de inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
+            <cheapy:inputField label="Fecha de fin" placeholder="dd/MM/yyyy HH:mm" name="end"/>
             
-            <petclinic:inputField label="Hora de inicio" placeholder="HH:mm" name="init"/>
-            <petclinic:inputField label="Hora de final" placeholder="HH:mm" name="finish"/>
-            <petclinic:inputField label="Descuento" placeholder="XX% (Ej.15)" name="discount"/>
+            <cheapy:inputField label="Hora de inicio" placeholder="HH:mm" name="init"/>
+            <cheapy:inputField label="Hora de final" placeholder="HH:mm" name="finish"/>
+            <cheapy:inputField label="Descuento" placeholder="XX% (Ej.15)" name="discount"/>
 
             </div>
         <div class="form-group">
@@ -43,4 +43,16 @@
             </div>
         </div>
     </form:form>
-</petclinic:layout>
+    
+    <div class="btn-return">
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+		    <fmt:message key="return"/> </button>
+	</div>
+   	<script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
+	
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp
index b0ffd00a6..f39937b1a 100644
--- a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp
@@ -11,7 +11,7 @@
     <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffer"/></h2>
 
 
-    <table class="table table-striped">
+    <table id="timeOfferTable" class="table table-striped">
         <thead>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
@@ -21,9 +21,17 @@
             <th><fmt:message key="offerEnding"/></th>
             <td><c:out value="${localDateTimeFormat.format(timeOffer.end)}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="init"/></th>
+            <td><c:out value="${timeOffer.init}h"/></td>
+        </tr>
+        <tr>
+            <th><fmt:message key="finish"/></th>
+            <td><c:out value="${timeOffer.finish}h"/></td>
+        </tr>
         <tr>
             <th><fmt:message key="discount"/></th>
-            <td><c:out value="${timeOffer.discount}"/></td>
+            <td><c:out value="${timeOffer.discount}%"/></td>
         </tr>
         <tr>
             <th><fmt:message key="offerCode"/></th>
@@ -34,7 +42,7 @@
 
 	<div class="btn-menu">
 	    <div class="btn-return">
-		    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> 
+		    <button type="button" role="link" onclick="goBack()" style="font-family: 'Lobster'; font-size: 20px;"> 
 		    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
 		    <fmt:message key="return"/> </button>
 	    </div>
@@ -56,6 +64,11 @@
 	    </div>
     </div>
     
+    <script>
+		function goBack() {
+		  window.history.back()
+		}
+	</script>
 
   
 </cheapy:layout>