diff --git a/1.sources/MyHealth/docroot/home.xhtml b/1.sources/MyHealth/docroot/home.xhtml
index a4a0008..c4f58b3 100644
--- a/1.sources/MyHealth/docroot/home.xhtml
+++ b/1.sources/MyHealth/docroot/home.xhtml
@@ -11,35 +11,52 @@
 	<ui:define name="content">
 		<h:form>
 			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-
 			<p:panel header="Pagina principal">
-				<p:panelGrid>
-					<p:outputLabel for="selectorTema" value="Cambio de tema" />
-					<p:themeSwitcher id="selectorTema" style="width:165px" value="#{sessionPreferences.currentTheme}">
-						<f:selectItem itemLabel="Seleccione un tema" itemValue="" noSelectionOption="true" />
-						<f:selectItems value="#{home.themes}" var="theme" itemLabel="#{theme.displayName}" itemValue="#{theme.name}" />
-						<p:ajax listener="#{sessionPreferences.updateCurrentTheme}" />
-					</p:themeSwitcher>
-				</p:panelGrid>
-				<h:panelGrid columns="2">
-					<h:outputLabel value="Fecha" />
-					<p:calendar pattern="dd/MM/yyyy" />
-					<h:outputLabel value="Rich Text Editor" />
-					<p:editor />
-				</h:panelGrid>
-				<h:panelGroup>
-					<h:panelGrid columns="2">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel for="selectorTema" value="Cambio de tema" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:themeSwitcher id="selectorTema" style="width:300px" value="#{sessionPreferences.currentTheme}">
+							<f:selectItem itemLabel="Seleccione un tema" itemValue="" noSelectionOption="true" />
+							<f:selectItems value="#{home.themes}" var="theme" itemLabel="#{theme.displayName}" itemValue="#{theme.name}" />
+							<p:ajax listener="#{sessionPreferences.updateCurrentTheme}" />
+						</p:themeSwitcher>
+					</div>
+					<div class="ui-g-4 ui-md-1" />
+
+					<div class="ui-g-4 ui-md-4" />
+					<div class="ui-g-4 ui-md-4 ">
+						<p:commandButton value="Usar tema en este sesión" update="mesgs" action="#{sessionPreferences.updateCurrentTheme}" icon="pi pi-save" />
+					</div>
+					<div class="ui-g-4 ui-md-4" />
+
+					<div class="ui-g-2 ui-md-2">
+						<div class="ui-inputgroup">
+							<p:calendar pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+							<p:commandButton value="Fecha" />
+						</div>
+					</div>
+					<div class="ui-g-10 ui-md-10" />
+
+					<div class="ui-g-2 ui-md-2">
+						<h:outputLabel value="Fecha" />
+						<p:calendar pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+					</div>
+					<div class="ui-g-10 ui-md-10" />
+					
+					<div class="ui-g-12">
+						<h:outputLabel value="Rich Text Editor" />
+					</div>
+					<div class="ui-g-12 ui-md-12">
+						<p:editor />
+					</div>
+
+					<div class="ui-g-12 ui-md-12">
 						<h:outputLabel value="Logeado como:" />
 						<p:inputText readonly="true" value="#{home.userName}" />
-					</h:panelGrid>
-				</h:panelGroup>
-			</p:panel>
-			<p:panel>
-				<h:panelGroup>
-					<h:panelGrid columns="1">
-						<p:commandButton value="Usar tema en este sesión" update="mesgs" action="#{sessionPreferences.updateCurrentTheme}" icon="pi pi-save" />
-					</h:panelGrid>
-				</h:panelGroup>
+					</div>
+				</div>
 			</p:panel>
 		</h:form>
 	</ui:define>
diff --git a/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml b/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
index 17b07dd..7fdede2 100644
--- a/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
+++ b/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
@@ -41,7 +41,7 @@
 						<p:message for="campo" display="text" />
 					</div>
 
-					<p:dataTable var="qs" value="#{PendingQuestions.lazyDataModelQuestionList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom" paginatorAlwaysVisible="true"
+					<p:dataTable widgetVar="dtPendingQuestions" var="qs" value="#{PendingQuestions.lazyDataModelQuestionList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom" paginatorAlwaysVisible="true"
 						paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,40">
 						<p:column headerText="Id" width="60px;">
 							<h:outputText value="#{qs.id}" />
@@ -62,8 +62,8 @@
 							<h:outputText value="Responder" />
 						</p:column>
 
-						<f:facet name="paginatorTopLeft">
-							<p:commandButton type="button" icon="pi pi-refresh" />
+						<f:facet name="paginatorBottomLeft">
+							<p:commandButton type="button" icon="pi pi-refresh" onclick="PF('dtPendingQuestions').getPaginator().setPage(0);" />
 						</f:facet>
 					</p:dataTable>