diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/SIPRPNode.driver.xml b/trunk/AnaliseAcidentesTrabalho/src/java/SIPRPNode.driver.xml
index 35688e62..0ee85dd3 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/SIPRPNode.driver.xml
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/SIPRPNode.driver.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <driver project-version="3.0" class="org.postgresql.Driver">
-	<!-- <url value="jdbc:postgresql://storage:5432/siprp_local"/> -->
-	<url value="jdbc:postgresql://localhost:5436/siprp_local_3"/>        
+	<!-- <url value="jdbc:postgresql://storage:5432/siprp_local"/> --> 
+	<url value="jdbc:postgresql://localhost:5436/siprp_local_3"/>       
 	<connectionPool min="1" max="1"/>
 	<login userName="postgres" password=""/>
 </driver>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
index 1c075f5f..c87aa014 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
@@ -169,7 +169,7 @@
                                                 </ui:panelGroup>
                                             </h:panelGrid>
                                         </h:panelGrid>
-                                        <ui:image binding="#{AnaliseAcidenteTrabalho.image28}" id="image28" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{AnaliseAcidenteTrabalho.image28}" height="40" id="image28" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridMsg}" columnClasses="gridColCenter" columns="1" id="gridMsg"
diff --git a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
index cbcdf6f7..6b25c4c9 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
@@ -28,7 +28,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{EnviarCorrecao.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{EnviarCorrecao.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{EnviarCorrecao.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{EnviarCorrecao.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel4" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
index 5189c380..e9782239 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
@@ -48,7 +48,7 @@
                                     style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FichaUtilizador.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FichaUtilizador.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FichaUtilizador.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FichaUtilizador.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
index ea1797ee..07722e94 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
@@ -28,7 +28,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormDirGerRh.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormDirGerRh.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormDirGerRh.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FormDirGerRh.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel8" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
index e106cf0c..6101796c 100755
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
@@ -28,7 +28,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormDirSiprp.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormDirSiprp.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormDirSiprp.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FormDirSiprp.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel3" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
index bfb0b3e8..8b897b6a 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
@@ -28,7 +28,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormGestor.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormGestor.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormGestor.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FormGestor.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel8" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
index 50f5777a..cfe3404d 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
@@ -28,7 +28,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormHS.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormHS.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormHS.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FormHS.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
index a6ce9226..7d19d5e3 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
@@ -28,7 +28,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormRH.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormRH.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormRH.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FormRH.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
index 776262c7..46a9e204 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
@@ -29,7 +29,7 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormSeguranca.groupPanel5}" id="groupPanel5" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormSeguranca.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormSeguranca.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{FormSeguranca.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel6">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
index f0b5db1b..2cbd783f 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
@@ -44,7 +44,7 @@
                                     id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{GestaoUtilizadores.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{GestaoUtilizadores.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{GestaoUtilizadores.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{GestaoUtilizadores.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel4" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/Header.jspf b/trunk/AnaliseAcidentesTrabalho/web/Header.jspf
index 0a533bd8..633668bb 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/Header.jspf
+++ b/trunk/AnaliseAcidentesTrabalho/web/Header.jspf
@@ -5,7 +5,7 @@
             style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
             <ui:panelGroup id="groupPanel1" style="height: 24px; width: 216px">
                 <ui:image id="imgLogoSiprp" url="/resources/images/SIPRP_logo_small.jpg"/>
-                <ui:image id="imgLogoAuchan" url="#{SessionBean1.logoEmpresaUrl}"/>
+                <ui:image height="40" id="imgLogoAuchan" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
             </ui:panelGroup>
             <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel2" style="height: 24px; width: 100%">
                 <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
index 81b88d43..9f284454 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
@@ -89,7 +89,7 @@
                                     style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{NovoUtilizador.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{NovoUtilizador.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{NovoUtilizador.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{NovoUtilizador.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel5" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp b/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
index 23accdbc..2ed373fe 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
@@ -17,13 +17,13 @@
                                     <ui:staticText binding="#{RecuperarPassword.staticText3}" id="staticText3"
                                         style="font-weight: bold; height: 24px; width: 240px" text="Preencha os seguintes dados pessoais"/>
                                     <h:panelGrid binding="#{RecuperarPassword.gridPanel4}" columnClasses="gridColLeft, gridColRight" columns="2" id="gridPanel4"
-                                        style="height: 72px" width="432">
+                                        style="height: 72px; width: 100%" width="100%">
                                         <ui:staticText binding="#{RecuperarPassword.staticText1}" id="staticText1"
                                             style="font-weight: bold; height: 24px; width: 144px" text="Utilizador:"/>
-                                        <ui:textField binding="#{RecuperarPassword.txtUtilizador}" id="txtUtilizador" style="width: 100%"/>
+                                        <ui:textField binding="#{RecuperarPassword.txtUtilizador}" columns="60" id="txtUtilizador" style="width: 420"/>
                                         <ui:staticText binding="#{RecuperarPassword.staticText2}" id="staticText2"
                                             style="font-weight: bold; height: 24px; width: 144px" text="E-mail:"/>
-                                        <ui:textField binding="#{RecuperarPassword.txtEmail}" id="txtEmail" style="width: 100%"/>
+                                        <ui:textField binding="#{RecuperarPassword.txtEmail}" columns="60" id="txtEmail" style="width: 420"/>
                                     </h:panelGrid>
                                     <h:panelGrid binding="#{RecuperarPassword.gridPanel5}" columnClasses="gridColRight" id="gridPanel5"
                                         style="height: 24px; width: 100%" width="360">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
index 0b8b31ac..490abd9b 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
@@ -48,7 +48,7 @@
                                     id="gridPanel1" style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{UtilizadorFields.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{UtilizadorFields.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{UtilizadorFields.image2}" id="image2" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{UtilizadorFields.image2}" height="40" id="image2" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </ui:panelGroup>
                                     <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel12" style="height: 24px; width: 100%">
                                         <ui:panelGroup id="groupPanel2">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
index 81911b28..a6074300 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
@@ -87,7 +87,7 @@
                                                 </ui:panelGroup>
                                             </h:panelGrid>
                                         </h:panelGrid>
-                                        <ui:image binding="#{ViewAnaliseAcidenteTrabalho.image5}" id="image5" url="#{SessionBean1.logoEmpresaUrl}"/>
+                                        <ui:image binding="#{ViewAnaliseAcidenteTrabalho.image5}" height="40" id="image5" url="#{SessionBean1.logoEmpresaUrl}" width="150"/>
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"