diff --git a/Project1.res b/Project1.res
index 20ba553..bc4d5f6 100644
Binary files a/Project1.res and b/Project1.res differ
diff --git a/UnitFormCidade.dfm b/UnitFormCidade.dfm
index 2c1141f..23392ce 100644
--- a/UnitFormCidade.dfm
+++ b/UnitFormCidade.dfm
@@ -1,10 +1,8 @@
 inherited FormCidade: TFormCidade
   Caption = 'Cadastro de cidade:'
-  ClientHeight = 312
   ClientWidth = 600
   OnCreate = FormCreate
   ExplicitWidth = 616
-  ExplicitHeight = 351
   PixelsPerInch = 96
   TextHeight = 15
   inherited ToolBar1: TToolBar
@@ -29,53 +27,60 @@ inherited FormCidade: TFormCidade
     inherited btImportar: TButton
       OnClick = btImportarClick
     end
-    inherited btExportar: TButton
-      OnClick = btExportarClick
-    end
     inherited btContar: TButton
       OnClick = btContarClick
     end
   end
   inherited Panel1: TPanel
     Width = 600
-    Height = 264
-    ExplicitHeight = 264
+    ExplicitHeight = 260
+    DesignSize = (
+      600
+      243)
     inherited Panel2: TPanel
-      Left = 100
+      Left = 108
       Top = 6
-      ExplicitLeft = 99
+      ExplicitLeft = 108
       ExplicitTop = 6
       object Label1: TLabel [0]
-        Left = 52
-        Top = 66
+        Left = 48
+        Top = 57
         Width = 42
         Height = 15
         Anchors = []
         Caption = 'C'#243'digo:'
+        ExplicitLeft = 52
+        ExplicitTop = 66
       end
       object Label2: TLabel [1]
-        Left = 54
-        Top = 111
+        Left = 50
+        Top = 97
         Width = 40
         Height = 15
         Anchors = []
         Caption = 'Cidade:'
+        ExplicitLeft = 54
+        ExplicitTop = 111
       end
       object Label3: TLabel [2]
-        Left = 69
-        Top = 161
+        Left = 65
+        Top = 141
         Width = 25
         Height = 15
         Anchors = []
         Caption = 'Pa'#237's:'
+        ExplicitLeft = 69
+        ExplicitTop = 161
       end
       object Label4: TLabel [3]
-        Left = 277
-        Top = 161
+        Left = 263
+        Top = 141
         Width = 19
         Height = 15
         Anchors = []
         Caption = 'UF:'
+        ExplicitLeft = 277
+        ExplicitTop = 161
       end
       inherited cbLimparCampos: TCheckBox
         TabOrder = 4
@@ -83,48 +88,55 @@ inherited FormCidade: TFormCidade
       end
       object edCidade: TEdit
         Tag = 1
-        Left = 109
-        Top = 108
+        Left = 100
+        Top = 94
         Width = 150
         Height = 23
         Anchors = []
         TabOrder = 0
         OnKeyPress = onKeyPress
+        ExplicitLeft = 109
+        ExplicitTop = 108
       end
       object edCod: TEdit
-        Left = 110
-        Top = 63
+        Left = 103
+        Top = 54
         Width = 75
         Height = 23
         Anchors = []
         TabOrder = 1
         OnExit = edCodExit
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 63
       end
       object edPais: TEdit
         Tag = 2
-        Left = 109
-        Top = 158
+        Left = 100
+        Top = 138
         Width = 150
         Height = 23
         Anchors = []
         TabOrder = 2
         OnKeyPress = onKeyPress
+        ExplicitLeft = 109
+        ExplicitTop = 158
       end
       object edUF: TEdit
         Tag = 3
-        Left = 310
-        Top = 158
+        Left = 293
+        Top = 138
         Width = 75
         Height = 23
         Anchors = []
         TabOrder = 3
         OnKeyPress = edFinalKeyPress
+        ExplicitLeft = 310
+        ExplicitTop = 158
       end
     end
   end
   inherited StatusBar1: TStatusBar
-    Top = 293
     Width = 600
     Panels = <
       item
diff --git a/UnitFormEstado.dfm b/UnitFormEstado.dfm
index b8a7eab..13d5030 100644
--- a/UnitFormEstado.dfm
+++ b/UnitFormEstado.dfm
@@ -1,16 +1,12 @@
 inherited FormEstado: TFormEstado
   Caption = 'Cadastro de estado:'
   ClientHeight = 313
-  ClientWidth = 601
   OnCreate = FormCreate
-  ExplicitWidth = 617
   ExplicitHeight = 352
   PixelsPerInch = 96
   TextHeight = 15
   inherited ToolBar1: TToolBar
-    Width = 601
     Anchors = []
-    ExplicitWidth = 601
     inherited btAnterior: TButton
       OnClick = btAnteriorClick
     end
@@ -21,7 +17,6 @@ inherited FormEstado: TFormEstado
       OnClick = btBuscarClick
     end
     inherited btInserir: TButton
-      Default = False
       OnClick = btInserirClick
     end
     inherited btExcluir: TButton
@@ -30,109 +25,118 @@ inherited FormEstado: TFormEstado
     inherited btImportar: TButton
       OnClick = btImportarClick
     end
-    inherited btExportar: TButton
-      OnClick = btExportarClick
-    end
     inherited btContar: TButton
       OnClick = btContarClick
     end
   end
   inherited Panel1: TPanel
-    Width = 601
-    Height = 265
-    ExplicitWidth = 601
-    ExplicitHeight = 265
-    inherited cbLimparCampos: TCheckBox
-      TabOrder = 1
-    end
+    Height = 244
+    ExplicitHeight = 261
     inherited Panel2: TPanel
-      Left = 102
+      Left = 110
       Top = 6
-      TabOrder = 0
-      ExplicitLeft = 102
-      object Label1: TLabel
-        Left = 50
-        Top = 65
+      ExplicitLeft = 110
+      ExplicitTop = 6
+      object Label1: TLabel [0]
+        Left = 46
+        Top = 56
         Width = 42
         Height = 15
         Anchors = []
         Caption = 'C'#243'digo:'
+        ExplicitLeft = 50
+        ExplicitTop = 65
       end
-      object Label2: TLabel
-        Left = 52
-        Top = 108
+      object Label2: TLabel [1]
+        Left = 48
+        Top = 94
         Width = 40
         Height = 15
         Anchors = []
         Caption = 'Estado:'
+        ExplicitLeft = 52
+        ExplicitTop = 108
       end
-      object Label3: TLabel
-        Left = 67
-        Top = 153
+      object Label3: TLabel [2]
+        Left = 63
+        Top = 134
         Width = 25
         Height = 15
         Anchors = []
         Caption = 'Pa'#237's:'
+        ExplicitLeft = 67
+        ExplicitTop = 153
       end
-      object Label4: TLabel
-        Left = 266
-        Top = 153
+      object Label4: TLabel [3]
+        Left = 252
+        Top = 134
         Width = 29
         Height = 15
         Anchors = []
         Caption = 'Al'#237'q.:'
+        ExplicitLeft = 266
+        ExplicitTop = 153
+      end
+      inherited cbLimparCampos: TCheckBox
+        TabOrder = 4
       end
       object edAliquota: TEdit
         Tag = 3
-        Left = 306
-        Top = 150
+        Left = 289
+        Top = 131
         Width = 75
         Height = 23
         Anchors = []
         TabOrder = 0
         OnKeyPress = edFinalKeyPress
+        ExplicitLeft = 306
+        ExplicitTop = 150
       end
       object edCod: TEdit
-        Left = 110
-        Top = 62
+        Left = 103
+        Top = 53
         Width = 75
         Height = 23
         Anchors = []
         TabOrder = 1
         OnExit = edCodExit
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 62
       end
       object edEstado: TEdit
         Tag = 1
-        Left = 110
-        Top = 105
+        Left = 101
+        Top = 91
         Width = 150
         Height = 23
         Anchors = []
         TabOrder = 2
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 105
       end
       object edPais: TEdit
         Tag = 2
-        Left = 110
-        Top = 150
+        Left = 101
+        Top = 131
         Width = 150
         Height = 23
         Anchors = []
         TabOrder = 3
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 150
       end
     end
   end
   inherited StatusBar1: TStatusBar
-    Top = 294
-    Width = 601
+    Top = 285
     Panels = <
       item
         Text = 'Aguardando'
         Width = 50
       end>
     ExplicitTop = 294
-    ExplicitWidth = 601
   end
 end
diff --git a/UnitFormGrid.dfm b/UnitFormGrid.dfm
index 2454cf0..a919f1d 100644
--- a/UnitFormGrid.dfm
+++ b/UnitFormGrid.dfm
@@ -27,7 +27,7 @@ object FormGrid: TFormGrid
     DrawingStyle = gdsClassic
     FixedCols = 0
     FixedRows = 0
-    Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goRowSelect]
+    Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing]
     ParentShowHint = False
     ShowHint = True
     TabOrder = 0
@@ -37,23 +37,23 @@ object FormGrid: TFormGrid
     Top = 0
     Width = 432
     Height = 29
-    ButtonHeight = 21
+    ButtonHeight = 30
     Caption = 'ToolBar1'
     TabOrder = 1
     object btExcluir: TButton
       Left = 0
       Top = 0
-      Width = 70
-      Height = 21
+      Width = 75
+      Height = 30
       Caption = 'Excluir'
       TabOrder = 0
       OnClick = btExcluirClick
     end
     object btEscolher: TButton
-      Left = 70
+      Left = 75
       Top = 0
-      Width = 70
-      Height = 21
+      Width = 75
+      Height = 30
       Caption = 'Escolher'
       Default = True
       TabOrder = 1
diff --git a/UnitFormGrid.pas b/UnitFormGrid.pas
index 9bd87af..f232c2f 100644
--- a/UnitFormGrid.pas
+++ b/UnitFormGrid.pas
@@ -20,7 +20,6 @@ type
     procedure btEscolherClick(Sender: TObject);
     procedure edPesquisaChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure testeStringGrid();
   private
     { Private declarations }
     palavra: string;
@@ -38,15 +37,6 @@ implementation
 {$R *.dfm}
 uses UnitFormCidade;
 
-procedure TFormGrid.testeStringGrid();
-begin
-//ShowMessage(FormGrid.StringGrid1.Cells[0,0]);
-  StringGrid1.Cells[0, 0] := 'a';
-  StringGrid1.Cells[1, 0] := 'a';
-  StringGrid1.Cells[2, 0] := 'a';
-  StringGrid1.Cells[3, 0] := 'a';
-end;
-
 procedure TFormGrid.btEscolherClick(Sender: TObject);
 var
   wObj: TObject;
@@ -236,7 +226,6 @@ begin
        FClass := Classe;
        checkList := false;
      end;
-  ShowMessage('wLista count:'+inttostr(Lista.Count));
   StringGrid1.RowCount := Lista.Count;
   for wCont := 0 to Lista.Count-1 do
     begin
diff --git a/UnitFormPadrao.dfm b/UnitFormPadrao.dfm
index d370044..4b0f4c8 100644
--- a/UnitFormPadrao.dfm
+++ b/UnitFormPadrao.dfm
@@ -2,7 +2,7 @@ object FormPadrao: TFormPadrao
   Left = 0
   Top = 0
   Caption = 'FormPadrao'
-  ClientHeight = 332
+  ClientHeight = 312
   ClientWidth = 601
   Color = clBtnFace
   Font.Charset = ANSI_CHARSET
@@ -21,16 +21,15 @@ object FormPadrao: TFormPadrao
     Left = 0
     Top = 0
     Width = 601
-    Height = 29
-    ButtonHeight = 20
+    Height = 41
+    ButtonHeight = 30
     Caption = 'ToolBar1'
     TabOrder = 0
-    ExplicitWidth = 598
     object btAnterior: TButton
       Left = 0
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
       Caption = '<'
       DoubleBuffered = False
       ParentDoubleBuffered = False
@@ -40,7 +39,7 @@ object FormPadrao: TFormPadrao
       Left = 75
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
       Caption = '>'
       DoubleBuffered = False
       ParentDoubleBuffered = False
@@ -50,7 +49,7 @@ object FormPadrao: TFormPadrao
       Left = 150
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
       Caption = 'Buscar'
       DoubleBuffered = False
       ParentDoubleBuffered = False
@@ -60,7 +59,7 @@ object FormPadrao: TFormPadrao
       Left = 225
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
       Caption = 'Inserir'
       DoubleBuffered = False
       ParentDoubleBuffered = False
@@ -70,63 +69,65 @@ object FormPadrao: TFormPadrao
       Left = 300
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
       Caption = 'Excluir'
       DoubleBuffered = False
       ParentDoubleBuffered = False
       TabOrder = 4
     end
-    object btImportar: TButton
+    object btExportar: TButton
       Left = 375
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
+      Caption = 'Exportar'
+      DoubleBuffered = False
+      ParentDoubleBuffered = False
+      TabOrder = 7
+    end
+    object btImportar: TButton
+      Left = 450
+      Top = 0
+      Width = 75
+      Height = 30
       Caption = 'Importar'
       DoubleBuffered = False
       ParentDoubleBuffered = False
       TabOrder = 5
     end
-    object btExportar: TButton
-      Left = 450
-      Top = 0
-      Width = 75
-      Height = 20
-      Caption = 'Exportar'
-      DoubleBuffered = False
-      ParentDoubleBuffered = False
-      TabOrder = 6
-    end
     object btContar: TButton
       Left = 525
       Top = 0
       Width = 75
-      Height = 20
+      Height = 30
       Caption = 'Contar'
       DoubleBuffered = False
       ParentDoubleBuffered = False
-      TabOrder = 7
+      TabOrder = 6
     end
   end
   object Panel1: TPanel
     Left = 0
-    Top = 29
+    Top = 41
     Width = 601
-    Height = 284
+    Height = 243
     Align = alClient
     TabOrder = 1
-    ExplicitWidth = 598
+    ExplicitLeft = 88
+    ExplicitTop = 61
+    ExplicitHeight = 271
     DesignSize = (
       601
-      284)
+      243)
     object Panel2: TPanel
       Left = 357
-      Top = 296
-      Width = 400
-      Height = 250
+      Top = 241
+      Width = 380
+      Height = 220
       Anchors = []
       BevelOuter = bvNone
       TabOrder = 0
-      ExplicitLeft = 354
+      ExplicitTop = 464
       object cbLimparCampos: TCheckBox
         Left = 344
         Top = 229
@@ -139,9 +140,9 @@ object FormPadrao: TFormPadrao
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Top = 313
+    Top = 284
     Width = 601
-    Height = 19
+    Height = 28
     Panels = <
       item
         BiDiMode = bdLeftToRight
@@ -149,7 +150,7 @@ object FormPadrao: TFormPadrao
         Text = 'Aguardando'
         Width = 50
       end>
-    ExplicitWidth = 598
+    ExplicitTop = 312
   end
   object SaveTextFileDialog1: TSaveTextFileDialog
     Left = 552
diff --git a/UnitFormPais.dfm b/UnitFormPais.dfm
index 47d2a7d..75f5443 100644
--- a/UnitFormPais.dfm
+++ b/UnitFormPais.dfm
@@ -1,12 +1,12 @@
 inherited FormPais: TFormPais
   Top = 17
   Caption = 'Cadastro de pa'#237's:'
-  ClientHeight = 314
+  ClientHeight = 311
   ClientWidth = 602
   Position = poDesigned
   OnCreate = FormCreate
   ExplicitWidth = 618
-  ExplicitHeight = 353
+  ExplicitHeight = 350
   PixelsPerInch = 96
   TextHeight = 15
   inherited ToolBar1: TToolBar
@@ -30,50 +30,53 @@ inherited FormPais: TFormPais
     inherited btImportar: TButton
       OnClick = btImportarClick
     end
-    inherited btExportar: TButton
-      OnClick = btExportarClick
-    end
   end
   inherited Panel1: TPanel
     Width = 602
-    Height = 266
+    Height = 242
     ExplicitWidth = 602
-    ExplicitHeight = 266
+    ExplicitHeight = 262
     DesignSize = (
       602
-      266)
+      242)
     inherited Panel2: TPanel
-      Left = 99
-      Top = 6
-      ExplicitLeft = 99
+      Left = 107
+      Top = 5
+      ExplicitLeft = 107
       ExplicitTop = 6
       object Label1: TLabel [0]
-        Left = 49
-        Top = 74
+        Left = 46
+        Top = 64
         Width = 42
         Height = 15
         Anchors = []
         Caption = 'C'#243'digo:'
+        ExplicitLeft = 49
+        ExplicitTop = 74
       end
       object Label2: TLabel [1]
-        Left = 66
-        Top = 117
+        Left = 62
+        Top = 102
         Width = 25
         Height = 15
         Anchors = []
         Caption = 'Pa'#237's:'
+        ExplicitLeft = 66
+        ExplicitTop = 117
       end
       object Label3: TLabel [2]
-        Left = 12
-        Top = 165
+        Left = 9
+        Top = 144
         Width = 79
         Height = 15
         Anchors = []
         Caption = 'Nacionalidade:'
+        ExplicitLeft = 12
+        ExplicitTop = 165
       end
       object Label4: TLabel [3]
-        Left = 268
-        Top = 163
+        Left = 36
+        Top = 183
         Width = 51
         Height = 15
         Anchors = []
@@ -83,19 +86,21 @@ inherited FormPais: TFormPais
         TabOrder = 4
       end
       object edCod: TEdit
-        Left = 110
-        Top = 71
+        Left = 103
+        Top = 61
         Width = 75
         Height = 23
         Anchors = []
         TabOrder = 0
         OnExit = edCodExit
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 71
       end
       object edCodFed: TEdit
         Tag = 3
-        Left = 325
-        Top = 160
+        Left = 103
+        Top = 180
         Width = 75
         Height = 23
         Anchors = []
@@ -104,28 +109,32 @@ inherited FormPais: TFormPais
       end
       object edNacionalidade: TEdit
         Tag = 2
-        Left = 110
-        Top = 162
+        Left = 101
+        Top = 141
         Width = 150
         Height = 23
         Anchors = []
         TabOrder = 2
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 162
       end
       object edPais: TEdit
         Tag = 1
-        Left = 110
-        Top = 114
+        Left = 101
+        Top = 99
         Width = 150
         Height = 23
         Anchors = []
         TabOrder = 3
         OnKeyPress = onKeyPress
+        ExplicitLeft = 110
+        ExplicitTop = 114
       end
     end
   end
   inherited StatusBar1: TStatusBar
-    Top = 295
+    Top = 283
     Width = 602
     Panels = <
       item
diff --git a/Win32/Debug/Project1.exe b/Win32/Debug/Project1.exe
index 62e73ee..879408a 100644
Binary files a/Win32/Debug/Project1.exe and b/Win32/Debug/Project1.exe differ
diff --git a/Win32/Debug/UnitFormCidade.dcu b/Win32/Debug/UnitFormCidade.dcu
index 4017d66..46ddf41 100644
Binary files a/Win32/Debug/UnitFormCidade.dcu and b/Win32/Debug/UnitFormCidade.dcu differ
diff --git a/Win32/Debug/UnitFormEstado.dcu b/Win32/Debug/UnitFormEstado.dcu
index aa91c39..d0cfe9e 100644
Binary files a/Win32/Debug/UnitFormEstado.dcu and b/Win32/Debug/UnitFormEstado.dcu differ
diff --git a/Win32/Debug/UnitFormGrid.dcu b/Win32/Debug/UnitFormGrid.dcu
index d05103e..97af53a 100644
Binary files a/Win32/Debug/UnitFormGrid.dcu and b/Win32/Debug/UnitFormGrid.dcu differ
diff --git a/Win32/Debug/UnitFormPadrao.dcu b/Win32/Debug/UnitFormPadrao.dcu
index f15e1f9..3c294e5 100644
Binary files a/Win32/Debug/UnitFormPadrao.dcu and b/Win32/Debug/UnitFormPadrao.dcu differ
diff --git a/Win32/Debug/UnitFormPais.dcu b/Win32/Debug/UnitFormPais.dcu
index 4d2ebd1..bf10b35 100644
Binary files a/Win32/Debug/UnitFormPais.dcu and b/Win32/Debug/UnitFormPais.dcu differ