diff --git a/trunk/siprp/ficha/EmpresaPanel.java b/trunk/siprp/ficha/EmpresaPanel.java
index ccbf30e5..2c199a76 100644
--- a/trunk/siprp/ficha/EmpresaPanel.java
+++ b/trunk/siprp/ficha/EmpresaPanel.java
@@ -72,7 +72,7 @@ public class EmpresaPanel extends JPanel
 		GridBagLayout gridbag = new GridBagLayout();
 		setLayout( gridbag );
 		GridBagConstraints constraints = new GridBagConstraints();
-		constraints.insets = new Insets( 1, 1, 1, 1 );
+		constraints.insets = new Insets( 0, 1, 0, 1 );
 		constraints.fill = GridBagConstraints.HORIZONTAL;
 		constraints.gridwidth = 1;
 		constraints.weightx = 0;
diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java
index 124dc1e6..c768ea16 100644
--- a/trunk/siprp/ficha/ExamePanel.java
+++ b/trunk/siprp/ficha/ExamePanel.java
@@ -101,7 +101,7 @@ public class ExamePanel extends JPanel
 		GridBagLayout gridbag = new GridBagLayout();
 		tipoPanel.setLayout( gridbag );
 		GridBagConstraints constraints = new GridBagConstraints();
-		constraints.insets = new Insets( 1, 1, 1, 1 );
+		constraints.insets = new Insets( 0, 1, 0, 1 );
 		constraints.fill = GridBagConstraints.HORIZONTAL;
 		constraints.weighty = 0;
 		constraints.gridheight = 1;
diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/siprp/ficha/FichaWindow.java
index 6d0cefa0..08ecff35 100644
--- a/trunk/siprp/ficha/FichaWindow.java
+++ b/trunk/siprp/ficha/FichaWindow.java
@@ -9,11 +9,12 @@ package siprp.ficha;
 import java.awt.*;
 import javax.swing.*;
 
+import com.evolute.utils.ui.window.*;
 /**
  *
  * @author  fpalma
  */
-public class FichaWindow extends JFrame
+public class FichaWindow extends TabbedWindow
 {
 	private UpperPanel upperPanel;
 	private EmpresaPanel empresaPanel;
@@ -22,34 +23,44 @@ public class FichaWindow extends JFrame
 	private ExamePanel examePanel;
 	private RecomendacoesPanel recomendacoesPanel;
 	
+	private static int permissions[][] = 
+		new int[][]{ { NEW_INDEX, CANCEL_INDEX, SAVE_INDEX, DELETE_INDEX, SELECT_BYNAME_INDEX } };
+	
 	/** Creates a new instance of FichaWindow */
 	public FichaWindow()
+		throws Exception
 	{
+		super( new UpperPanel(), new String[]{ "Empresa/Trabalhador", "Exame" }, 
+				createPermissions( permissions ) );
+		upperPanel = (UpperPanel) getUpperPanel();
 		setupComponents();
 	}
 	
 	private void setupComponents()
 	{
-		setSize( 700, 550 );
+		setSize( 700, 570 );
 		setResizable( false );
 		setTitle( "Ficha de Aptid\u00e3o" );
 		
-		upperPanel = new UpperPanel();
-		JTabbedPane tabbed = new JTabbedPane();
-		getContentPane().setLayout( new BorderLayout() );
-		getContentPane().add( upperPanel, BorderLayout.NORTH );
-		getContentPane().add( tabbed, BorderLayout.CENTER );
-		
-		JPanel empresaTrabalhadorPanel = new JPanel();
-		JPanel exameRecomendacoesPanel = new JPanel();
+//		upperPanel = new UpperPanel();
+//		JTabbedPane tabbed = new JTabbedPane();
+//		getContentPane().setLayout( new BorderLayout() );
+//		getContentPane().add( upperPanel, BorderLayout.NORTH );
+//		getContentPane().add( tabbed, BorderLayout.CENTER );
+//		
+//		JPanel empresaTrabalhadorPanel = new JPanel();
+//		JPanel exameRecomendacoesPanel = new JPanel();
+//		
+//		tabbed.add( "Empresa/Trabalhador", empresaTrabalhadorPanel );
+//		tabbed.add( "Exame", exameRecomendacoesPanel );
 		
-		tabbed.add( "Empresa/Trabalhador", empresaTrabalhadorPanel );
-		tabbed.add( "Exame", exameRecomendacoesPanel );
+		JPanel empresaTrabalhadorPanel = getTab( 0 );
+		JPanel exameRecomendacoesPanel = getTab( 1 );
 		
 		GridBagLayout gridbag = new GridBagLayout();
 		empresaTrabalhadorPanel.setLayout( gridbag );
 		GridBagConstraints constraints = new GridBagConstraints();
-		constraints.insets = new Insets( 1, 1, 1, 1 );
+		constraints.insets = new Insets( 0, 1, 0, 1 );
 		constraints.fill = GridBagConstraints.BOTH;
 		constraints.weightx = 1;
 		constraints.gridwidth = GridBagConstraints.REMAINDER;
@@ -74,7 +85,7 @@ public class FichaWindow extends JFrame
 		gridbag = new GridBagLayout();
 		exameRecomendacoesPanel.setLayout( gridbag );
 		constraints = new GridBagConstraints();
-		constraints.insets = new Insets( 1, 1, 1, 1 );
+		constraints.insets = new Insets( 0, 1, 0, 1 );
 		constraints.fill = GridBagConstraints.BOTH;
 		constraints.weightx = 1;
 		constraints.gridwidth = GridBagConstraints.REMAINDER;
diff --git a/trunk/siprp/ficha/ObservacoesPanel.java b/trunk/siprp/ficha/ObservacoesPanel.java
index 4324a43b..a583c392 100644
--- a/trunk/siprp/ficha/ObservacoesPanel.java
+++ b/trunk/siprp/ficha/ObservacoesPanel.java
@@ -37,7 +37,7 @@ public class ObservacoesPanel extends JPanel
 		observacoesText.setWrapStyleWord( true );
 		scp.setViewportView( observacoesText );
 		
-		setLayout( new GridLayout( 1, 1 ) );
+		setLayout( new GridLayout( 1, 1, 0, 0 ) );
 		add( scp );
 	}
 }
diff --git a/trunk/siprp/ficha/RecomendacoesPanel.java b/trunk/siprp/ficha/RecomendacoesPanel.java
index f793459d..6ecc6429 100644
--- a/trunk/siprp/ficha/RecomendacoesPanel.java
+++ b/trunk/siprp/ficha/RecomendacoesPanel.java
@@ -42,7 +42,7 @@ public class RecomendacoesPanel extends JPanel
 		JLabel proximoExameLabel = new JLabel( "Pr\u00f3ximo Exame" );
 		proximoExamePanel = new JCalendarPanel( null );
 		
-		setLayout( new GridLayout( 1, 2 ) );
+		setLayout( new GridLayout( 1, 2, 0, 0 ) );
 		add( scp );
 		add( rightPanel );
 		
diff --git a/trunk/siprp/ficha/TrabalhadorPanel.java b/trunk/siprp/ficha/TrabalhadorPanel.java
index 9b3e35c9..0e47f383 100644
--- a/trunk/siprp/ficha/TrabalhadorPanel.java
+++ b/trunk/siprp/ficha/TrabalhadorPanel.java
@@ -70,7 +70,7 @@ public class TrabalhadorPanel extends JPanel
 		GridBagLayout gridbag = new GridBagLayout();
 		setLayout( gridbag );
 		GridBagConstraints constraints = new GridBagConstraints();
-		constraints.insets = new Insets( 1, 1, 1, 1 );
+		constraints.insets = new Insets( 0, 1, 0, 1 );
 		constraints.fill = GridBagConstraints.HORIZONTAL;
 		constraints.weighty = 0;
 		constraints.gridheight = 1;
diff --git a/trunk/siprp/ficha/UpperPanel.java b/trunk/siprp/ficha/UpperPanel.java
index 2d7bfa50..3e1f8d9f 100644
--- a/trunk/siprp/ficha/UpperPanel.java
+++ b/trunk/siprp/ficha/UpperPanel.java
@@ -42,7 +42,7 @@ public class UpperPanel extends JPanel
 		GridBagLayout gridbag = new GridBagLayout();
 		setLayout( gridbag );
 		GridBagConstraints constraints = new GridBagConstraints();
-		constraints.insets = new Insets( 1, 1, 1, 1 );
+		constraints.insets = new Insets( 0, 1, 0, 1 );
 		constraints.fill = GridBagConstraints.HORIZONTAL;
 		constraints.gridheight = 1;
 		constraints.weighty = 0;