diff --git a/base/forms.py b/base/forms.py
index c0905a944..0c80ec947 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -9,68 +9,9 @@ from crispy_layout_mixin import form_actions
 
 from .models import CasaLegislativa
 
-ESTADOS = {"": "",
-           "AC": "ACRE",
-           "AL": "ALAGOAS",
-           "AM": "AMAZONAS",
-           "AP": "AMAPÁ",
-           "BA": "BAHIA",
-           "CE": "CEARÁ",
-           "DF": "DISTRITO FEDERAL",
-           "ES": "ESPíRITO SANTO",
-           "GO": "GOIÁS",
-           "MA": "MARANHÃO",
-           "MG": "MINAS GERAIS",
-           "MS": "MATO GROSSO DO SUL",
-           "MT": "MATO GROSSO",
-           "PA": "PARÁ",
-           "PB": "PARAÍBA",
-           "PE": "PERNAMBUCO",
-           "PI": "PIAUÍ",
-           "PR": "PARANÁ",
-           "RJ": "RIO DE JANEIRO",
-           "RN": "RIO GRANDE DO NORTE",
-           "RO": "RONDÔNIA",
-           "RR": "RORAIMA",
-           "RS": "RIO GRANDE DO SUL",
-           "SC": "SANTA CATARINA",
-           "SE": "SERGIPE",
-           "SP": "SÃO PAULO",
-           "TO": "TOCANTINS"}
-
 
 class CasaLegislativaTabelaAuxForm(ModelForm):
 
-    uf = forms.ChoiceField(required=True,
-                           label='UF',
-                           choices=[(uf, uf) for uf in ESTADOS.keys()],
-                           widget=forms.Select(
-                               attrs={'class': 'selector'}))
-
-    informacao_geral = forms.CharField(widget=forms.Textarea,
-                                       label=_('Informação Geral'),
-                                       required=False)
-
-    telefone = forms.CharField(label='Telefone',
-                               required=False,
-                               widget=forms.TextInput(
-                                   attrs={'class': 'telefone'}))
-
-    logotipo = forms.ImageField(label='Logotipo',
-                                required=False,
-                                widget=forms.FileInput
-                                )
-
-    cep = forms.CharField(label='Cep',
-                          required=True,
-                          widget=forms.TextInput(
-                              attrs={'class': 'cep'}))
-
-    fax = forms.CharField(label='Fax',
-                          required=False,
-                          widget=forms.TextInput(
-                              attrs={'class': 'telefone'}))
-
     class Meta:
 
         model = CasaLegislativa
@@ -88,6 +29,13 @@ class CasaLegislativaTabelaAuxForm(ModelForm):
                   'email',
                   'informacao_geral']
 
+        widgets = {
+            'uf': forms.Select(attrs={'class': 'selector'}),
+            'cep': forms.TextInput(attrs={'class': 'cep'}),
+            'telefone': forms.TextInput(attrs={'class': 'telefone'}),
+            'fax': forms.TextInput(attrs={'class': 'telefone'}),
+        }
+
     def __init__(self, *args, **kwargs):
 
         row1 = crispy_layout_mixin.to_row(
diff --git a/base/models.py b/base/models.py
index 9080d75e0..22bd80719 100644
--- a/base/models.py
+++ b/base/models.py
@@ -10,6 +10,36 @@ def get_casa_media_path(instance, filename):
     return get_sessao_media_path(instance, 'Logotipo', filename)
 
 
+ESTADOS = {"": "",
+           "AC": "ACRE",
+           "AL": "ALAGOAS",
+           "AM": "AMAZONAS",
+           "AP": "AMAPÁ",
+           "BA": "BAHIA",
+           "CE": "CEARÁ",
+           "DF": "DISTRITO FEDERAL",
+           "ES": "ESPíRITO SANTO",
+           "GO": "GOIÁS",
+           "MA": "MARANHÃO",
+           "MG": "MINAS GERAIS",
+           "MS": "MATO GROSSO DO SUL",
+           "MT": "MATO GROSSO",
+           "PA": "PARÁ",
+           "PB": "PARAÍBA",
+           "PE": "PERNAMBUCO",
+           "PI": "PIAUÍ",
+           "PR": "PARANÁ",
+           "RJ": "RIO DE JANEIRO",
+           "RN": "RIO GRANDE DO NORTE",
+           "RO": "RONDÔNIA",
+           "RR": "RORAIMA",
+           "RS": "RIO GRANDE DO SUL",
+           "SC": "SANTA CATARINA",
+           "SE": "SERGIPE",
+           "SP": "SÃO PAULO",
+           "TO": "TOCANTINS"}
+
+
 class CasaLegislativa(models.Model):
     # TODO ajustar todos os max_length !!!!
     # cod_casa => id (pk)
@@ -20,7 +50,9 @@ class CasaLegislativa(models.Model):
     endereco = models.CharField(max_length=100, verbose_name=_('Endereço'))
     cep = models.CharField(max_length=100, verbose_name=_('CEP'))
     municipio = models.CharField(max_length=100, verbose_name=_('Município'))
-    uf = models.CharField(max_length=100, verbose_name=_('UF'))
+    uf = models.CharField(max_length=100,
+                          choices=[(uf, uf) for uf in ESTADOS.keys()],
+                          verbose_name=_('UF'))
     telefone = models.CharField(
         max_length=100, blank=True, verbose_name=_('Telefone'))
     fax = models.CharField(
@@ -33,7 +65,7 @@ class CasaLegislativa(models.Model):
         max_length=100, blank=True, verbose_name=_('HomePage'))
     email = models.EmailField(
         max_length=100, blank=True, verbose_name=_('E-mail'))
-    informacao_geral = models.CharField(
+    informacao_geral = models.TextField(
         max_length=100,
         blank=True,
         verbose_name=_('Informação Geral'))
diff --git a/relatorios/views.py b/relatorios/views.py
index 6a79732aa..97c069316 100644
--- a/relatorios/views.py
+++ b/relatorios/views.py
@@ -4,7 +4,7 @@ from bs4 import BeautifulSoup
 from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
 
-from base.forms import ESTADOS
+from base.models import ESTADOS
 from base.models import CasaLegislativa
 from comissoes.models import Comissao
 from materia.models import (Autor, Autoria, MateriaLegislativa, Numeracao,