diff --git a/trunk/siprp/ficha/ficha_aptidao.xsl b/trunk/siprp/ficha/ficha_aptidao.xsl
index a6e7bda7..8f45d2f7 100644
--- a/trunk/siprp/ficha/ficha_aptidao.xsl
+++ b/trunk/siprp/ficha/ficha_aptidao.xsl
@@ -8,7 +8,7 @@
 			
 			<fo:layout-master-set>
 				<fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm"
-				                    margin-top="2cm" margin-bottom="1cm" margin-left="2cm" margin-right="2cm">
+				                    margin-top="1cm" margin-bottom="0.1cm" margin-left="2cm" margin-right="2cm">
 					<fo:region-body/>
 				</fo:simple-page-master>
 			</fo:layout-master-set>
@@ -22,38 +22,54 @@
 							(<xsl:value-of select="portaria"/>)
 						</fo:block>
 						<fo:table table-layout="fixed" border-color="black" border-style="solid" border-width="medium">
-							<fo:table-column column-width="proportional-column-width(100)" />
+							<fo:table-column column-width="proportional-column-width(50)" />
+							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-body>
 								
-								<fo:table-row border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thick">
-									<fo:table-cell >
+								<fo:table-row >
+									<fo:table-cell border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thin" number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm" font-weight="bold">
 	Empresa/Entidade
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
-									<fo:table-cell >
+									<fo:table-cell number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 DESIGNA&#xc7;&#xc3;O SOCIAL: <xsl:value-of select="designacao_social"/>
 										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+								<fo:table-row>
+									<fo:table-cell number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-ESTABELECIMENTO: <xsl:value-of select="estabelecimentos.nome"/>	(tab)	LOCALIDADE: <xsl:value-of select="estabelecimentos.localidade"/>
+ESTABELECIMENTO: <xsl:value-of select="estabelecimentos.nome"/>
 										</fo:block>
+									</fo:table-cell>
+									<fo:table-cell number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-SERVI&#xc7;O DE SA&#xda;DE: <xsl:value-of select="servico_saude_tipo_interno"/> Interno 
-<xsl:value-of select="servico_saude_tipo_interempresas"/> Interempresas 
-<xsl:value-of select="servico_saude_tipo_externo"/>Externo 
-<xsl:value-of select="servico_saude_tipo_sns"/>Servico Nacional de Sa&#xfa;de
+LOCALIDADE: <xsl:value-of select="estabelecimentos.localidade"/>
+										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+								<fo:table-row>
+									<fo:table-cell number-columns-spanned="2">
+										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+SERVI&#xc7;O DE SA&#xda;DE: Tipo
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_saude_tipo_interno"/> Interno </fo:inline>
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_saude_tipo_interempresas"/> Interempresas </fo:inline>
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_saude_tipo_externo"/>Externo </fo:inline>
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_saude_tipo_sns"/>Servico Nacional de Sa&#xfa;de </fo:inline>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 DESIGNA&#xc7;&#xc3;O: <xsl:value-of select="servico_saude_designacao"/>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-SERVI&#xc7;O DE HIGIENE E SEGURAN&#xc7;A: Tipo	<xsl:value-of select="servico_higiene_tipo_interno"/> Interno	
-<xsl:value-of select="servico_higiene_tipo_interempresas"/>Interempresas
-<xsl:value-of select="servico_higiene_tipo_externo"/>Externo
-<xsl:value-of select="servico_higiene_tipo_outro"/>Outro
+SERVI&#xc7;O DE HIGIENE E SEGURAN&#xc7;A: Tipo
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_higiene_tipo_interno"/> Interno </fo:inline>
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_higiene_tipo_interempresas"/>Interempresas </fo:inline>
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_higiene_tipo_externo"/>Externo </fo:inline>
+	<fo:inline font-size="8pt">&#160;&#160;&#160;&#160;<xsl:value-of select="servico_higiene_tipo_outro"/>Outro </fo:inline>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 DESIGNA&#xc7;&#xc3;O: <xsl:value-of select="servico_higiene_designacao"/>
@@ -63,87 +79,105 @@ DESIGNA&#xc7;&#xc3;O: <xsl:value-of select="servico_higiene_designacao"/>
 								</fo:table-row>
 							</fo:table-body>
 						</fo:table>
-<fo:table table-layout="fixed" space-before="5mm">
-							<fo:table-column column-width="proportional-column-width(50)" />
-							<fo:table-column column-width="proportional-column-width(50)" />
+<fo:table table-layout="fixed" space-before="5mm" border-color="black" border-style="solid" border-width="medium">
+							<fo:table-column column-width="proportional-column-width(1)" />
+							<fo:table-column column-width="proportional-column-width(1)" />
+							<fo:table-column column-width="proportional-column-width(1)" />
+							<fo:table-column column-width="proportional-column-width(1)" />
+							<fo:table-column column-width="proportional-column-width(1)" />
+							<fo:table-column column-width="proportional-column-width(1)" />
 							<fo:table-body>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
+									<fo:table-cell border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thin" number-columns-spanned="6">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm" font-weight="bold">
 	Trabalhador
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="1">
+									<fo:table-cell number-columns-spanned="6">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 NOME: <xsl:value-of select="trabalhadores.nome"/>
 										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+								<fo:table-row>
+									<fo:table-cell number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-SEXO:  <xsl:value-of select="sexo"/>	(tab)	DATA DE NASCIMENTO: <xsl:value-of select="data_nascimento"/>
+SEXO:  <xsl:value-of select="sexo"/>
 										</fo:block>
+									</fo:table-cell>
+									<fo:table-cell number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-N&#xda;MERO MECANOGR&#xc1;FICO/OUTRO: <xsl:value-of select="numero_mecanografico"/>
+DATA DE NASCIMENTO: <xsl:value-of select="data_nascimento"/>
 										</fo:block>
+									</fo:table-cell>
+									<fo:table-cell number-columns-spanned="3">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-CATEGORIA PROFISSIONAL: <xsl:value-of select="categoria"/>
+NACIONALIDADE: <xsl:value-of select="nacionalidade"/>
 										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+								<fo:table-row>
+									<fo:table-cell number-columns-spanned="3">
+
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-FUNCAO PROPOSTA: <xsl:value-of select="funcao_proposta"/>
+N&#xda;MERO MECANOGR&#xc1;FICO/OUTRO: <xsl:value-of select="numero_mecanografico"/>
 										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+CATEGORIA PROFISSIONAL: <xsl:value-of select="categoria"/>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-	NACIONALIDADE: <xsl:value-of select="nacionalidade"/>
+FUNCAO PROPOSTA: <xsl:value-of select="funcao_proposta"/>
 										</fo:block>
+									</fo:table-cell>
+									<fo:table-cell number-columns-spanned="3">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-	DATA DE ADMISS&#xc3;O: <xsl:value-of select="data_admissao"/>
+DATA DE ADMISS&#xc3;O: <xsl:value-of select="data_admissao"/>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-	LOCAL DE TRABALHO: <xsl:value-of select="local_trabalho"/>
+LOCAL DE TRABALHO: <xsl:value-of select="local_trabalho"/>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-	DATA DE ADMISS&#xc3;O NA FUN&#xc7;&#xc3;O: <xsl:value-of select="data_admissao_funcao"/>
+DATA DE ADMISS&#xc3;O NA FUN&#xc7;&#xc3;O: <xsl:value-of select="data_admissao_funcao"/>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>
 						</fo:table>
-<fo:table table-layout="fixed" space-before="5mm">
+<fo:table table-layout="fixed" space-before="5mm" border-color="black" border-style="solid" border-width="medium">
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-body>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
+									<fo:table-cell border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thin" number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm" font-weight="bold">
 	Observa&#xe7;&#xf5;es
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
-										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+									<fo:table-cell number-columns-spanned="2">
+										<fo:block font-size="8pt" space-before="1cm" margin-left="0.2cm">
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>
 						</fo:table>
 
-<fo:table table-layout="fixed" space-before="5mm">
+<fo:table table-layout="fixed" space-before="5mm" border-color="black" border-style="solid" border-width="medium">
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-body>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
+									<fo:table-cell border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thin" number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm" font-weight="bold">
 	Exame M&#xe9;dico
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="1">
+									<fo:table-cell border-right-color="black" border-right-style="solid" border-right-width="thin" number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 DATA DO EXAME: <xsl:value-of select="exames.data"/>
 										</fo:block>
@@ -184,7 +218,7 @@ TIPO
 ESPECIFIQUE: <xsl:value-of select="tipo_outro_texto"/>
 										</fo:block>
 									</fo:table-cell>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="1">
+									<fo:table-cell number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 RESULTADO
 										</fo:block>
@@ -195,6 +229,7 @@ RESULTADO
 <xsl:value-of select="resultado_apto_condicionalmente"/> APTO CONDICIONALMENTE
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+	&#160;
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 <xsl:value-of select="resultado_inapto_temp"/> INAPTO TEMPORARIAMENTE
@@ -203,6 +238,7 @@ RESULTADO
 <xsl:value-of select="resultado_inapto_def"/> INAPTO DEFINITIVAMENTE
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+	&#160;
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 OUTRAS FUN&#xc7;&#xd5;ES QUE PODE DESEMPENHAR
@@ -220,24 +256,25 @@ OUTRAS FUN&#xc7;&#xd5;ES QUE PODE DESEMPENHAR
 	4 <xsl:value-of select="outra_funcao_4"/>
 										</fo:block>
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+	&#160;
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>
 						</fo:table>
-<fo:table table-layout="fixed" space-before="5mm">
+<fo:table table-layout="fixed" space-before="5mm" border-color="black" border-style="solid" border-width="medium">
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-body>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
+									<fo:table-cell border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thin" number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm" font-weight="bold">
 	Outras Recomenda&#xe7;&#xf5;es
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
+									<fo:table-cell number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 <xsl:value-of select="outras_recomendacoes"/>
 										</fo:block>
@@ -248,15 +285,24 @@ PR&#xd3;XIMO EXAME: <xsl:value-of select="proximo_exame"/>
 								</fo:table-row>
 							</fo:table-body>
 						</fo:table>
-<fo:table table-layout="fixed" space-before="5mm">
+<fo:table table-layout="fixed" space-before="5mm" border-color="black" border-style="solid" border-width="medium">
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-column column-width="proportional-column-width(50)" />
 							<fo:table-body>
 								<fo:table-row>
-									<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
+									<fo:table-cell number-columns-spanned="1">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
-M&#xc9;DICO DO TRABALHO: <xsl:value-of select="medicos.nome"/>	(tab)	C.P. <xsl:value-of select="numero_cedula"/>
+M&#xc9;DICO DO TRABALHO: <xsl:value-of select="medicos.nome"/>
 										</fo:block>
+									</fo:table-cell>
+									<fo:table-cell number-columns-spanned="1">
+										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
+C.P. <xsl:value-of select="numero_cedula"/>
+										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+								<fo:table-row>
+									<fo:table-cell number-columns-spanned="2">
 										<fo:block font-size="8pt" space-before="0.3cm" margin-left="0.2cm">
 ASSINATURA ________________________________________________________________________________________________
 										</fo:block>