diff --git a/UnitFormCidade.dfm b/UnitFormCidade.dfm
index 23392ce..4e0c21f 100644
--- a/UnitFormCidade.dfm
+++ b/UnitFormCidade.dfm
@@ -4,7 +4,7 @@ inherited FormCidade: TFormCidade
   OnCreate = FormCreate
   ExplicitWidth = 616
   PixelsPerInch = 96
-  TextHeight = 15
+  TextHeight = 18
   inherited ToolBar1: TToolBar
     Width = 600
     inherited btAnterior: TButton
@@ -38,49 +38,40 @@ inherited FormCidade: TFormCidade
       600
       243)
     inherited Panel2: TPanel
-      Left = 108
-      Top = 6
-      ExplicitLeft = 108
-      ExplicitTop = 6
       object Label1: TLabel [0]
-        Left = 48
-        Top = 57
-        Width = 42
-        Height = 15
+        Left = 70
+        Top = 20
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'C'#243'digo:'
-        ExplicitLeft = 52
-        ExplicitTop = 66
       end
       object Label2: TLabel [1]
-        Left = 50
-        Top = 97
-        Width = 40
-        Height = 15
+        Left = 70
+        Top = 70
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'Cidade:'
-        ExplicitLeft = 54
-        ExplicitTop = 111
       end
       object Label3: TLabel [2]
-        Left = 65
-        Top = 141
-        Width = 25
-        Height = 15
-        Anchors = []
+        Left = 70
+        Top = 120
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Caption = 'Pa'#237's:'
-        ExplicitLeft = 69
-        ExplicitTop = 161
       end
       object Label4: TLabel [3]
-        Left = 263
-        Top = 141
-        Width = 19
-        Height = 15
+        Left = 300
+        Top = 120
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'UF:'
-        ExplicitLeft = 277
-        ExplicitTop = 161
       end
       inherited cbLimparCampos: TCheckBox
         TabOrder = 4
@@ -88,51 +79,43 @@ inherited FormCidade: TFormCidade
       end
       object edCidade: TEdit
         Tag = 1
-        Left = 100
-        Top = 94
+        Left = 130
+        Top = 70
         Width = 150
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 0
         OnKeyPress = onKeyPress
-        ExplicitLeft = 109
-        ExplicitTop = 108
       end
       object edCod: TEdit
-        Left = 103
-        Top = 54
+        Left = 130
+        Top = 20
         Width = 75
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 1
         OnExit = edCodExit
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 63
       end
       object edPais: TEdit
         Tag = 2
-        Left = 100
-        Top = 138
+        Left = 130
+        Top = 120
         Width = 150
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 2
         OnKeyPress = onKeyPress
-        ExplicitLeft = 109
-        ExplicitTop = 158
       end
       object edUF: TEdit
         Tag = 3
-        Left = 293
-        Top = 138
+        Left = 360
+        Top = 120
         Width = 75
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 3
         OnKeyPress = edFinalKeyPress
-        ExplicitLeft = 310
-        ExplicitTop = 158
       end
     end
   end
diff --git a/UnitFormEstado.dfm b/UnitFormEstado.dfm
index 13d5030..fb0355b 100644
--- a/UnitFormEstado.dfm
+++ b/UnitFormEstado.dfm
@@ -4,7 +4,7 @@ inherited FormEstado: TFormEstado
   OnCreate = FormCreate
   ExplicitHeight = 352
   PixelsPerInch = 96
-  TextHeight = 15
+  TextHeight = 18
   inherited ToolBar1: TToolBar
     Anchors = []
     inherited btAnterior: TButton
@@ -33,100 +33,84 @@ inherited FormEstado: TFormEstado
     Height = 244
     ExplicitHeight = 261
     inherited Panel2: TPanel
-      Left = 110
-      Top = 6
-      ExplicitLeft = 110
-      ExplicitTop = 6
       object Label1: TLabel [0]
-        Left = 46
-        Top = 56
-        Width = 42
-        Height = 15
+        Left = 70
+        Top = 20
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'C'#243'digo:'
-        ExplicitLeft = 50
-        ExplicitTop = 65
       end
       object Label2: TLabel [1]
-        Left = 48
-        Top = 94
-        Width = 40
-        Height = 15
+        Left = 70
+        Top = 70
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'Estado:'
-        ExplicitLeft = 52
-        ExplicitTop = 108
       end
       object Label3: TLabel [2]
-        Left = 63
-        Top = 134
-        Width = 25
-        Height = 15
+        Left = 70
+        Top = 120
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'Pa'#237's:'
-        ExplicitLeft = 67
-        ExplicitTop = 153
       end
       object Label4: TLabel [3]
-        Left = 252
-        Top = 134
-        Width = 29
-        Height = 15
+        Left = 300
+        Top = 120
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'Al'#237'q.:'
-        ExplicitLeft = 266
-        ExplicitTop = 153
       end
       inherited cbLimparCampos: TCheckBox
         TabOrder = 4
       end
       object edAliquota: TEdit
         Tag = 3
-        Left = 289
-        Top = 131
+        Left = 360
+        Top = 120
         Width = 75
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 0
         OnKeyPress = edFinalKeyPress
-        ExplicitLeft = 306
-        ExplicitTop = 150
       end
       object edCod: TEdit
-        Left = 103
-        Top = 53
+        Left = 130
+        Top = 20
         Width = 75
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 1
         OnExit = edCodExit
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 62
       end
       object edEstado: TEdit
         Tag = 1
-        Left = 101
-        Top = 91
+        Left = 130
+        Top = 70
         Width = 150
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 2
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 105
       end
       object edPais: TEdit
         Tag = 2
-        Left = 101
-        Top = 131
+        Left = 130
+        Top = 120
         Width = 150
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 3
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 150
       end
     end
   end
diff --git a/UnitFormGrid.dfm b/UnitFormGrid.dfm
index a919f1d..0fe3923 100644
--- a/UnitFormGrid.dfm
+++ b/UnitFormGrid.dfm
@@ -6,10 +6,10 @@ object FormGrid: TFormGrid
   AutoScroll = True
   Caption = 'FormGrid'
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
+  Font.Charset = ANSI_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'Tahoma'
+  Font.Height = -13
+  Font.Name = 'Trebuchet MS'
   Font.Style = []
   FormStyle = fsMDIChild
   OldCreateOrder = False
@@ -17,7 +17,7 @@ object FormGrid: TFormGrid
   OnClose = FormClose
   OnCreate = FormCreate
   PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 18
   object StringGrid1: TStringGrid
     Left = 0
     Top = 59
@@ -46,6 +46,12 @@ object FormGrid: TFormGrid
       Width = 75
       Height = 30
       Caption = 'Excluir'
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
+      ParentFont = False
       TabOrder = 0
       OnClick = btExcluirClick
     end
@@ -56,6 +62,12 @@ object FormGrid: TFormGrid
       Height = 30
       Caption = 'Escolher'
       Default = True
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
+      ParentFont = False
       TabOrder = 1
       OnClick = btEscolherClick
     end
@@ -64,7 +76,7 @@ object FormGrid: TFormGrid
     Left = 64
     Top = 35
     Width = 70
-    Height = 21
+    Height = 26
     TabOrder = 2
     OnChange = edPesquisaChange
   end
diff --git a/UnitFormPadrao.dfm b/UnitFormPadrao.dfm
index 4b0f4c8..27674c2 100644
--- a/UnitFormPadrao.dfm
+++ b/UnitFormPadrao.dfm
@@ -8,7 +8,7 @@ object FormPadrao: TFormPadrao
   Font.Charset = ANSI_CHARSET
   Font.Color = clWindowText
   Font.Height = -13
-  Font.Name = 'Times New Roman'
+  Font.Name = 'Trebuchet MS'
   Font.Style = []
   FormStyle = fsMDIChild
   OldCreateOrder = False
@@ -16,7 +16,7 @@ object FormPadrao: TFormPadrao
   OnActivate = FormActivate
   OnClose = FormClose
   PixelsPerInch = 96
-  TextHeight = 15
+  TextHeight = 18
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
@@ -32,7 +32,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = '<'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 0
     end
     object btProximo: TButton
@@ -52,7 +58,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = 'Buscar'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 2
     end
     object btInserir: TButton
@@ -62,7 +74,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = 'Inserir'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 3
     end
     object btExcluir: TButton
@@ -72,7 +90,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = 'Excluir'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 4
     end
     object btExportar: TButton
@@ -82,7 +106,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = 'Exportar'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 7
     end
     object btImportar: TButton
@@ -92,7 +122,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = 'Importar'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 5
     end
     object btContar: TButton
@@ -102,7 +138,13 @@ object FormPadrao: TFormPadrao
       Height = 30
       Caption = 'Contar'
       DoubleBuffered = False
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -13
+      Font.Name = 'Trebuchet MS'
+      Font.Style = []
       ParentDoubleBuffered = False
+      ParentFont = False
       TabOrder = 6
     end
   end
@@ -113,21 +155,19 @@ object FormPadrao: TFormPadrao
     Height = 243
     Align = alClient
     TabOrder = 1
-    ExplicitLeft = 88
-    ExplicitTop = 61
-    ExplicitHeight = 271
+    ExplicitLeft = -64
+    ExplicitTop = 129
     DesignSize = (
       601
       243)
     object Panel2: TPanel
-      Left = 357
-      Top = 241
-      Width = 380
-      Height = 220
+      Left = 50
+      Top = 20
+      Width = 500
+      Height = 200
       Anchors = []
       BevelOuter = bvNone
       TabOrder = 0
-      ExplicitTop = 464
       object cbLimparCampos: TCheckBox
         Left = 344
         Top = 229
diff --git a/UnitFormPais.dfm b/UnitFormPais.dfm
index 75f5443..91c903c 100644
--- a/UnitFormPais.dfm
+++ b/UnitFormPais.dfm
@@ -8,7 +8,7 @@ inherited FormPais: TFormPais
   ExplicitWidth = 618
   ExplicitHeight = 350
   PixelsPerInch = 96
-  TextHeight = 15
+  TextHeight = 18
   inherited ToolBar1: TToolBar
     Width = 602
     ExplicitWidth = 602
@@ -40,96 +40,86 @@ inherited FormPais: TFormPais
       602
       242)
     inherited Panel2: TPanel
-      Left = 107
-      Top = 5
-      ExplicitLeft = 107
-      ExplicitTop = 6
       object Label1: TLabel [0]
-        Left = 46
-        Top = 64
-        Width = 42
-        Height = 15
+        Left = 70
+        Top = 20
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'C'#243'digo:'
-        ExplicitLeft = 49
-        ExplicitTop = 74
       end
       object Label2: TLabel [1]
-        Left = 62
-        Top = 102
-        Width = 25
-        Height = 15
+        Left = 70
+        Top = 70
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
         Caption = 'Pa'#237's:'
-        ExplicitLeft = 66
-        ExplicitTop = 117
       end
       object Label3: TLabel [2]
-        Left = 9
-        Top = 144
-        Width = 79
-        Height = 15
+        Left = 70
+        Top = 120
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
-        Caption = 'Nacionalidade:'
-        ExplicitLeft = 12
-        ExplicitTop = 165
+        AutoSize = False
+        Caption = 'Nacio.:'
       end
       object Label4: TLabel [3]
-        Left = 36
-        Top = 183
-        Width = 51
-        Height = 15
+        Left = 70
+        Top = 170
+        Width = 50
+        Height = 25
+        Alignment = taRightJustify
         Anchors = []
-        Caption = 'C'#243'd.Fed.:'
+        AutoSize = False
+        Caption = 'C'#243'd.F:'
       end
       inherited cbLimparCampos: TCheckBox
         TabOrder = 4
       end
       object edCod: TEdit
-        Left = 103
-        Top = 61
+        Left = 130
+        Top = 20
         Width = 75
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 0
         OnExit = edCodExit
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 71
       end
       object edCodFed: TEdit
         Tag = 3
-        Left = 103
-        Top = 180
+        Left = 130
+        Top = 170
         Width = 75
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 1
         OnKeyPress = edFinalKeyPress
       end
       object edNacionalidade: TEdit
         Tag = 2
-        Left = 101
-        Top = 141
+        Left = 130
+        Top = 120
         Width = 150
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 2
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 162
       end
       object edPais: TEdit
         Tag = 1
-        Left = 101
-        Top = 99
+        Left = 130
+        Top = 70
         Width = 150
-        Height = 23
+        Height = 26
         Anchors = []
         TabOrder = 3
         OnKeyPress = onKeyPress
-        ExplicitLeft = 110
-        ExplicitTop = 114
       end
     end
   end
diff --git a/Win32/Debug/Project1.exe b/Win32/Debug/Project1.exe
index 879408a..04a7563 100644
Binary files a/Win32/Debug/Project1.exe and b/Win32/Debug/Project1.exe differ