diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
index ae5327ae..010d77fc 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
@@ -894,6 +894,132 @@
 
             </div>
         </div>
+        
+        <div class="panel panel-default">
+           	<div class="panel-heading">Cirurgias</div>
+           	<div class="panel-body">            	
+				<table class="table table-bordered table-striped">
+					<thead>
+						<tr>
+							<th class="col-md-2">Data/Ano</th>
+							<th class="col-md-9">Motivo Diagnóstico</th>
+							<th class="col-md-1">&nbsp;</th>
+						</tr>
+					</thead>
+					<tfoot>
+						<tr>
+							<td colspan="5">
+								<button
+									ng-click="gridAddItem({}, editing.antecedentesPessoaisCirurgias, 'antecedentesPessoaisCirurgias', $event)"
+									type="button" class="btn btn-default btn-xs">
+									<span class="glyphicon glyphicon-plus"></span>Adicionar
+								</button>
+							</td>
+						</tr>
+					</tfoot>
+					<tbody>
+						<tr ng-repeat="item in editing.antecedentesPessoaisCirurgias">
+							<td><input ng-model="item.data" data-required="true"
+								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
+								type="text" class="form-control" datepicker /></td>
+							<td><input ng-model="item.motivo_diagnostico"
+								data-required="true" type="text" class="form-control" /></td>
+							<td>
+								<button
+									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisCirurgias, $event)"
+									type="button" class="btn btn-danger btn-xs">
+									<span class="glyphicon glyphicon-remove"></span>
+								</button>
+							</td>
+						</tr>
+					</tbody>
+				</table>					
+			</div>
+        </div>	
+        
+        <div class="panel panel-default">
+           	<div class="panel-heading">Fracturas</div>
+           	<div class="panel-body">            	
+				<table class="table table-bordered table-striped">
+					<thead>
+						<tr>
+							<th class="col-md-2">Data/Ano</th>
+							<th class="col-md-9">Motivo Diagnóstico</th>
+							<th class="col-md-1">&nbsp;</th>
+						</tr>
+					</thead>
+					<tfoot>
+						<tr>
+							<td colspan="5">
+								<button
+									ng-click="gridAddItem({}, editing.antecedentesPessoaisFracturas, 'antecedentesPessoaisFracturas', $event)"
+									type="button" class="btn btn-default btn-xs">
+									<span class="glyphicon glyphicon-plus"></span>Adicionar
+								</button>
+							</td>
+						</tr>
+					</tfoot>
+					<tbody>
+						<tr ng-repeat="item in editing.antecedentesPessoaisFracturas">
+							<td><input ng-model="item.data" data-required="true"
+								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
+								type="text" class="form-control" datepicker /></td>
+							<td><input ng-model="item.motivo_diagnostico"
+								data-required="true" type="text" class="form-control" /></td>
+							<td>
+								<button
+									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisFracturas, $event)"
+									type="button" class="btn btn-danger btn-xs">
+									<span class="glyphicon glyphicon-remove"></span>
+								</button>
+							</td>
+						</tr>
+					</tbody>
+				</table>					
+			</div>
+        </div>
+        
+        <div class="panel panel-default">
+           	<div class="panel-heading">Internamentos</div>
+           	<div class="panel-body">            	
+				<table class="table table-bordered table-striped">
+					<thead>
+						<tr>
+							<th class="col-md-2">Data/Ano</th>
+							<th class="col-md-9">Motivo Diagnóstico</th>
+							<th class="col-md-1">&nbsp;</th>
+						</tr>
+					</thead>
+					<tfoot>
+						<tr>
+							<td colspan="5">
+								<button
+									ng-click="gridAddItem({}, editing.antecedentesPessoaisInternamentos, 'antecedentesPessoaisInternamentos', $event)"
+									type="button" class="btn btn-default btn-xs">
+									<span class="glyphicon glyphicon-plus"></span>Adicionar
+								</button>
+							</td>
+						</tr>
+					</tfoot>
+					<tbody>
+						<tr ng-repeat="item in editing.antecedentesPessoaisInternamentos">
+							<td><input ng-model="item.data" data-required="true"
+								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
+								type="text" class="form-control" datepicker /></td>
+							<td><input ng-model="item.motivo_diagnostico"
+								data-required="true" type="text" class="form-control" /></td>
+							<td>
+								<button
+									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisInternamentos, $event)"
+									type="button" class="btn btn-danger btn-xs">
+									<span class="glyphicon glyphicon-remove"></span>
+								</button>
+							</td>
+						</tr>
+					</tbody>
+				</table>					
+			</div>
+        </div>
 
         <h4 class="section-title" id="section5">5 - Hábitos</h4>
 		<partials-renderer partial-id="Habitos-1"></partials-renderer>
@@ -1102,7 +1228,7 @@
                     <textarea ng-model="editing.problemasSolucoes.problemas_saude" rows="3" class="form-control"></textarea>
                 </div>
                 <div class="form-group">
-                    <label class="control-label">Soluções para problemas relacionados com Saúde</label>
+                    <label class="control-label">Propostas de Solução para problemas relacionados com Saúde</label>
                     <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_saude" rows="3" class="form-control"></textarea>
                 </div>                
             </div>
@@ -1114,138 +1240,11 @@
                     <textarea ng-model="editing.problemasSolucoes.problemas_trabalho" rows="3" class="form-control"></textarea>
                 </div>
                 <div class="form-group">
-                    <label class="control-label">Soluções para problemas relacionados com o Trabalho</label>
+                    <label class="control-label">Propostas de Solução para problemas relacionados com o Trabalho</label>
                     <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_trabalho" rows="3" class="form-control"></textarea>
                 </div>
             </div>
-        </div>
-             
-        <!--  TODO: rever novas grelhas -->
-        <div class="panel panel-default">
-           	<div class="panel-heading">Cirurgias</div>
-           	<div class="panel-body">            	
-				<table class="table table-bordered table-striped">
-					<thead>
-						<tr>
-							<th class="col-md-2">Data/Ano</th>
-							<th class="col-md-9">Motivo Diagnóstico</th>
-							<th class="col-md-1">&nbsp;</th>
-						</tr>
-					</thead>
-					<tfoot>
-						<tr>
-							<td colspan="5">
-								<button
-									ng-click="gridAddItem({}, editing.antecedentesPessoaisCirurgias, 'antecedentesPessoaisCirurgias', $event)"
-									type="button" class="btn btn-default btn-xs">
-									<span class="glyphicon glyphicon-plus"></span>Adicionar
-								</button>
-							</td>
-						</tr>
-					</tfoot>
-					<tbody>
-						<tr ng-repeat="item in editing.antecedentesPessoaisCirurgias">
-							<td><input ng-model="item.data" data-required="true"
-								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
-								type="text" class="form-control" datepicker /></td>
-							<td><input ng-model="item.motivo_diagnostico"
-								data-required="true" type="text" class="form-control" /></td>
-							<td>
-								<button
-									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisCirurgias, $event)"
-									type="button" class="btn btn-danger btn-xs">
-									<span class="glyphicon glyphicon-remove"></span>
-								</button>
-							</td>
-						</tr>
-					</tbody>
-				</table>					
-			</div>
-        </div>	
-        
-        <div class="panel panel-default">
-           	<div class="panel-heading">Fracturas</div>
-           	<div class="panel-body">            	
-				<table class="table table-bordered table-striped">
-					<thead>
-						<tr>
-							<th class="col-md-2">Data/Ano</th>
-							<th class="col-md-9">Motivo Diagnóstico</th>
-							<th class="col-md-1">&nbsp;</th>
-						</tr>
-					</thead>
-					<tfoot>
-						<tr>
-							<td colspan="5">
-								<button
-									ng-click="gridAddItem({}, editing.antecedentesPessoaisFracturas, 'antecedentesPessoaisFracturas', $event)"
-									type="button" class="btn btn-default btn-xs">
-									<span class="glyphicon glyphicon-plus"></span>Adicionar
-								</button>
-							</td>
-						</tr>
-					</tfoot>
-					<tbody>
-						<tr ng-repeat="item in editing.antecedentesPessoaisFracturas">
-							<td><input ng-model="item.data" data-required="true"
-								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
-								type="text" class="form-control" datepicker /></td>
-							<td><input ng-model="item.motivo_diagnostico"
-								data-required="true" type="text" class="form-control" /></td>
-							<td>
-								<button
-									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisFracturas, $event)"
-									type="button" class="btn btn-danger btn-xs">
-									<span class="glyphicon glyphicon-remove"></span>
-								</button>
-							</td>
-						</tr>
-					</tbody>
-				</table>					
-			</div>
-        </div>
-        
-        <div class="panel panel-default">
-           	<div class="panel-heading">Internamentos</div>
-           	<div class="panel-body">            	
-				<table class="table table-bordered table-striped">
-					<thead>
-						<tr>
-							<th class="col-md-2">Data/Ano</th>
-							<th class="col-md-9">Motivo Diagnóstico</th>
-							<th class="col-md-1">&nbsp;</th>
-						</tr>
-					</thead>
-					<tfoot>
-						<tr>
-							<td colspan="5">
-								<button
-									ng-click="gridAddItem({}, editing.antecedentesPessoaisInternamentos, 'antecedentesPessoaisInternamentos', $event)"
-									type="button" class="btn btn-default btn-xs">
-									<span class="glyphicon glyphicon-plus"></span>Adicionar
-								</button>
-							</td>
-						</tr>
-					</tfoot>
-					<tbody>
-						<tr ng-repeat="item in editing.antecedentesPessoaisInternamentos">
-							<td><input ng-model="item.data" data-required="true"
-								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
-								type="text" class="form-control" datepicker /></td>
-							<td><input ng-model="item.motivo_diagnostico"
-								data-required="true" type="text" class="form-control" /></td>
-							<td>
-								<button
-									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisInternamentos, $event)"
-									type="button" class="btn btn-danger btn-xs">
-									<span class="glyphicon glyphicon-remove"></span>
-								</button>
-							</td>
-						</tr>
-					</tbody>
-				</table>					
-			</div>
-        </div>
+        </div> 
 
         <h4 class="section-title" id="section14">14 - Observações</h4>
         <div class="panel panel-default">