diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.directive.js b/src/app/components/cadastro-proposta/cadastro-proposta.directive.js
new file mode 100644
index 0000000..afa5b79
--- /dev/null
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.directive.js
@@ -0,0 +1,65 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('dialoga')
+    .directive('cadastroProposta', cadastroProposta);
+
+  /** @ngInject */
+  function cadastroProposta() {
+
+    /** @ngInject */
+    function CadastroPropostaController(ArticleService, $scope, $element, $timeout, $log) {
+      $log.debug('cadastroPropostaController');
+
+      var vm = this;
+      vm.ArticleService = ArticleService;
+      vm.$scope = $scope;
+      vm.$element = $element;
+      vm.$timeout = $timeout;
+      vm.$log = $log;
+
+      vm.init();
+
+      vm.loadData();
+    }
+
+    CadastroPropostaController.prototype.loadData = function () {
+      // async values
+      var vm = this;
+
+      // requeue to wait until DOM be created
+      vm.$timeout(function(){
+        attachPopover.call(vm);
+      }, 100);
+    };
+
+    function attachPopover(){
+      var vm = this;
+
+      vm.popover = angular.element(vm.$element.find('.texto-proposta'));
+      vm.popover.popover({
+        html: true,
+        placement: 'right',
+        animation: true,
+        title: 'Regra de posição das propostas',
+        content: '<p>Poderia escrever a sua proposta em um texto simples e breve?</p><br><p>Sua proposta passará pela fase de moderação. Assim que ela estiver pronta para compartilhar, avisaremos você.'
+      });
+    }
+
+    var directive = {
+      restrict: 'E',
+      templateUrl: 'app/components/cadastro-proposta/cadastro-proposta.html',
+      scope: {
+        programa: '=',
+        proposta: '=',
+      },
+      controller: CadastroPropostaController,
+      controllerAs: 'vm',
+      bindToController: true
+    };
+
+    return directive;
+  }
+
+})();
diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.html b/src/app/components/cadastro-proposta/cadastro-proposta.html
new file mode 100644
index 0000000..fc2dd6e
--- /dev/null
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.html
@@ -0,0 +1,45 @@
+<div id="message" class="envio-proposta">
+	<div class="row linha-proposta">
+		<div class="col-sm-8">
+			<span class="titulo-envio-proposta">Faça sua proposta</span>
+			<p>
+				Aqui você cadastra sua proposta e ajuda a construir um Brasil melhor.
+			</p>
+		</div>
+	</div>
+	<div class="row linha-proposta">
+		<div class="col-sm-8">
+			<p>Você está fazendo uma proposta para o programa:</p>
+			<div class="bloco-programa">
+				<span class="texto-programa">{{ ::vm.programa }}</span>
+			</div>
+		</div>
+	</div>
+	<form role="form" name="envioProposta" ng-submit="" novalidate>
+		<div class="row linha-proposta">
+			<div class="col-sm-8">
+				<div class="form-group">
+					<p>Descrição da proposta*</p>
+					<!-- <label for="proposta">Descrição da proposta*</label> -->
+					<textarea id="proposta" name="proposta" form="envioProposta" class="texto-proposta form-control"  ng-class="{ 'has-error' : envioProposta.proposta.$invalid && envioProposta.proposta.$touched }" ng-model="vm.proposta" required ng-maxlength="200" ></textarea>
+					<div ng-show="envioProposta.proposta.$touched">
+						<div ng-messages="envioProposta.proposta.$error">
+							<div ng-messages-include="./app/pages/geral/error-messages.html"></div>
+						</div>
+					</div>
+					<span class="pull-left">*Dados obrigatórios</span>
+					<span class="pull-right">Máx. 200 caracteres</span>
+				</div>
+			</div>
+		</div>
+		<div class="row linha-proposta">
+			<div class="col-sm-3">
+				<div class="form-group">
+					<button class="btn btn-lg btn-block btn-submit" type="submit">Enviar Proposta</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+
+</div>
\ No newline at end of file
diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.scss b/src/app/components/cadastro-proposta/cadastro-proposta.scss
new file mode 100644
index 0000000..2f5a08f
--- /dev/null
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.scss
@@ -0,0 +1,27 @@
+.envio-proposta {
+    .titulo-envio-proposta{
+        color: #2D7B66;
+    }
+
+    .bloco-programa {
+        border-color: gray;
+        border-width: 1px;
+        border-style: solid;
+        border-radius: 5px;
+        padding: 15px;
+    }
+
+    .texto-programa {
+        font-weight: 600;
+    }
+
+    .linha-proposta {
+        margin-bottom: 40px;
+    }
+
+    .texto-proposta {
+        width: 100%;
+        height: 200px;
+        resize: none;
+    }
+}
diff --git a/src/app/index.route.js b/src/app/index.route.js
index afa36e7..7b209dc 100644
--- a/src/app/index.route.js
+++ b/src/app/index.route.js
@@ -35,6 +35,7 @@
           'footer': { templateUrl: 'app/pages/footer/footer.html' }
         }
       })
+      // apenas para teste das mensagens
       .state('mensagem', {
         url: '/mensagem',
         ncyBreadcrumb: {label: 'Mensagem'},
@@ -129,6 +130,20 @@
           'footer': { templateUrl: 'app/pages/footer/footer.html' }
         }
       })
+      // apenas para teste do cadastro das propostas
+      .state('cadastro-propostas', {
+        url: '/cadastro-propostas',
+        ncyBreadcrumb: {label: 'Cadastro de Propostas'},
+        views: {
+          'header': { templateUrl: 'app/pages/header/header.html' },
+          'main': {
+            templateUrl: 'app/pages/propostas/cadastro-proposta.html',
+            controller: 'CadastroPropostaController',
+            controllerAs: 'pagePropostas'
+          },
+          'footer': { templateUrl: 'app/pages/footer/footer.html' }
+        }
+      })
       .state('propostas-conteudo', {
         url: '/propostas/:id',
         ncyBreadcrumb: {
diff --git a/src/app/layout.scss b/src/app/layout.scss
index 06cce5e..c393eb6 100644
--- a/src/app/layout.scss
+++ b/src/app/layout.scss
@@ -124,16 +124,60 @@
     color: #ff4431
 }
 
-.modal-termos-uso-header{
-    border-bottom: none;  
+.modal-termos-uso{
+  &-header{
+    border-bottom: none;
     padding: 0px;
     min-height: 10px;
     border-bottom: none;
     padding: 0px;
-}
+    position: relative;
+    top: -30px;
+    right: 0px;
+  }
 
-.modal-termos-uso-body {
-    padding: 30px;
+  &-body {
+    padding: 25px 35px;
     height: 500px;
-    overflow-y: auto;
+
+    &-inner{
+      background-color: lightgray;
+      overflow-y: auto;
+      padding: 15px;
+      height: 440px;
+    }
+  }
+}
+
+.modal-fechar-pequeno {
+  font-size: 15px;
 }
+
+.modal-fechar-grande {
+  font-size: 24px;
+}
+
+// Sobreescreve a classe do bootstrap
+.close {
+  // position: absolute;
+  color: white;
+  opacity: 1;
+  font-weight: normal;
+}
+
+// Cria uma barra de rolagem parecida com a pedida, mas aplica pro site todo
+// ::-webkit-scrollbar {
+//     width: 12px;
+//     background-color: gray;
+// }
+
+// ::-webkit-scrollbar-track {
+//     -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+//     border-radius: 10px;
+// }
+
+// ::-webkit-scrollbar-thumb {
+//     border-radius: 10px;
+//     -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+//     background-color: black;
+// }
\ No newline at end of file
diff --git a/src/app/pages/auth/message.html b/src/app/pages/auth/message.html
index 9bcb15a..fe26268 100644
--- a/src/app/pages/auth/message.html
+++ b/src/app/pages/auth/message.html
@@ -15,54 +15,46 @@
 			<div class="modal-content">
 				<div class="modal-header modal-termos-uso-header">
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
+						<span aria-hidden="true" class="modal-fechar-pequeno">FECHAR</span>
+						<span aria-hidden="true" class="modal-fechar-grande">X</span>
 					</button>
 				</div>
 				<div class="modal-body modal-termos-uso-body">
+					<div class="modal-termos-uso-body-inner">
 						<h3>Termos de Uso</h3>
 						<p>
 							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-	                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-	                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-	                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-	                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-	                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+							tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+							quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+							consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+							cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+							proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 						</p>
 						<p>
 							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-	                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-	                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-	                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-	                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-	                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+							tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+							quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+							consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+							cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+							proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 						</p>
 						<p>
 							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-	                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-	                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-	                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-	                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-	                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+							tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+							quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+							consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+							cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+							proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 						</p>
-
-						<p>
-							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-	                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-	                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-	                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-	                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-	                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-						</p>
-
 						<p>
 							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-	                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-	                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-	                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-	                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-	                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+							tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+							quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+							consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+							cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+							proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 						</p>
-
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/src/app/pages/auth/signin.html b/src/app/pages/auth/signin.html
index e24b361..0e79d32 100644
--- a/src/app/pages/auth/signin.html
+++ b/src/app/pages/auth/signin.html
@@ -1,206 +1,207 @@
 <div class="container">
-  <div class="row">
-    <div class="col-sm-12">
-      <h2>Cadastrar ou entrar</h2>
-    </div>
-  </div>
+	<div class="row">
+		<div class="col-sm-12">
+			<h2>Cadastrar ou entrar</h2>
+		</div>
+	</div>
 </div>
 <section role="main" class="section-gray auth-content">
-  <div class="container">
-    <div class="row">
-      <!-- Mostra só se estiver logado  -->
-      <div ng-if="pageSignin.currentUser">
-        <div class="row">
-          <div class="col-sm-8 col-sm-offset-2">
-            <h3>Você está logado!</h3>
-            <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
-          </div>
-        </div>
-      </div>
-      <!-- Mostra só se não estiver logado  -->
-      <div ng-if="!pageSignin.currentUser">
-        <div class="col-sm-6">
-          <div class="row">
-            <div class="col-md-12">
-              <h2>Já possui cadastro</h2>
-              <p>Use seus dados para acessar o Dialoga Brasil</p>
-              <form name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)" novalidate>
-                <div class="form-group">
-                  <label for="inputLoginUsername">E-mail*</label>
-                  <input type="email" id="inputLoginUsername" name="inputLoginUsername" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginUsername.$invalid && loginForm.inputLoginUsername.$touched }" ng-model="pageSignin.credentials.username" required/>
-                  <div ng-show="loginForm.inputLoginUsername.$touched">
-                    <div ng-messages="loginForm.inputLoginUsername.$error">
-                      <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-                    </div>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <label for="inputLoginPassword">Senha*</label>
-                  <input type="password" id="inputLoginPassword" name="inputLoginPassword" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginPassword.$invalid && loginForm.inputLoginPassword.$touched }" ng-model="pageSignin.credentials.password" required>
-                  <div ng-show="loginForm.inputLoginPassword.$touched">
-                    <div ng-messages="loginForm.inputLoginPassword.$error">
-                      <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-                    </div>
-                  </div>
-                </div>
-                <div class="form-group">
-                  <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
-                </div>
-              </form>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-md-12">
-              <hr class="separator separator-or"></hr>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-md-5">
-            <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
-              <div class="border-social-icon border-social-facebook">
-                <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
-                  <!-- Facebook -->
-                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
-                    <path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/>
-                  </svg>
-                </span>
-              </div>
-              <span class="text">Entrar com Facebook</span>
-            </button>
-          </div>
-          <div class="col-md-5">
-            <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
-              <div class="border-social-icon border-social-googlePlus">
-                <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
-                  <!-- Google Plus -->
-                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
-                    <path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/>
-                  </svg>
-                </span>
-              </div>
-              <span class="text">Entrar com Google+</span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="col-sm-6">
-        <div class="row">
-          <div class="col-sm-12">
-            <h2>Ou cadastre-se</h2>
-            <p>
-              Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!
-            </p>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-md-6">
-            <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
-              <div class="border-social-icon border-social-facebook">
-                <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
-                  <!-- Google Plus -->
-                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
-                    <path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/>
-                  </svg>
-                </span>
-              </div>
-              <span class="text">Conectar pelo Facebook</span>
-            </button>
-          </div>
-          <div class="col-md-6">
-            <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
-              <div class="border-social-icon border-social-googlePlus">
-                <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
-                  <!-- Google Plus -->
-                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
-                    <path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/>
-                  </svg>
-                </span>
-              </div>
-              <span class="text">Conectar pelo Google+</span>
-            </button>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-12">
-            <hr class="separator separator-cadastro"></hr>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-sm-12">
-          <form name="cadastroForm">
-            <div class="form-group">
-              <label for="inputNome">Nome:</label>
-              <span class="pull-right">*Dados obrigatórios</span>
-              <input type="text" id="inputNome" name="inputNome" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputNome.$invalid && cadastroForm.inputNome.$touched }" ng-model="nome" ng-minlength="" ng-maxlength="" required>
-              <div ng-show="cadastroForm.inputNome.$touched">
-                <div ng-messages="cadastroForm.inputNome.$error">
-                  <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-                </div>
-              </div>
-            </div>
-            <div class="form-group">
-              <label for="inputEmail">E-mail*</label>
-              <input type="email" id="inputEmail" name="inputEmail" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputEmail.$invalid && cadastroForm.inputEmail.$touched }" ng-model="email" ng-minlength="" ng-maxlength="" required>
-              <div ng-show="cadastroForm.inputEmail.$touched">
-                <div ng-messages="cadastroForm.inputEmail.$error">
-                  <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-sm-6">
-                <div class="form-group">
-                  <label for="inputPassword">Senha:</label>
-                  <input type="password" id="inputPassword" name="inputPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputPassword.$invalid && cadastroForm.inputPassword.$touched }" ng-model="senha" ng-minlength="" ng-maxlength="" required>
-                  <div ng-show="cadastroForm.inputPassword.$touched">
-                    <div ng-messages="cadastroForm.inputPassword.$error">
-                      <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="col-sm-6">
-                <div class="form-group">
-                  <label for="inputRepeatPassword">Confirmar Senha:</label>
-                  <input type="password" id="inputRepeatPassword" name="inputRepeatPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputRepeatPassword.$invalid && cadastroForm.inputRepeatPassword.$touched }" ng-model="senhaRepetida" ng-minlength="" ng-maxlength="" required>
-                  <div ng-show="cadastroForm.inputRepeatPassword.$touched">
-                    <div ng-messages="cadastroForm.inputRepeatPassword.$error">
-                      <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-sm-12">
-                <span class="text">
-                  A senha deve ter 6 ou mais caracteres e conter números e letras.
-                </span>
-              </div>
-            </div>
-            <div class="form-group">
-              <input type="checkbox" id="termosDeUso" name="termosDeUso" value="aceito" required>
-              Já li os
-              <a href="">Termos de Uso</a>
-              e concordo com os mesmos*
-            </input>
-            <div ng-show="cadastroForm.termosDeUso.$touched">
-              <div ng-messages="cadastroForm.termosDeUso.$error">
-                <div ng-messages-include="app/pages/geral/error-messages.html"></div>
-              </div>
-            </div>
-          </div>
-          <div class="form-group">
-            <span>Digite o texto da imagem</span>
-            <p>O Captcha vai aqui</p>
-          </div>
-          <div class="form-group">
-            <button class="btn btn-lg btn-block btn-submit" type="submit">Cadastrar</button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
+	<div class="container">
+		<div class="row">
+			<!-- Mostra só se estiver logado  -->
+			<div ng-if="pageSignin.currentUser">
+				<div class="row">
+					<div class="col-sm-8 col-sm-offset-2">
+						<h3>Você está logado!</h3>
+						<button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
+					</div>
+				</div>
+			</div>
+			<!-- Mostra só se não estiver logado  -->
+			<div ng-if="!pageSignin.currentUser">
+				<div class="col-sm-6">
+					<div class="row">
+						<div class="col-md-12">
+							<h2>Já possui cadastro</h2>
+							<p>Use seus dados para acessar o Dialoga Brasil</p>
+							<form role="form" name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)" novalidate>
+								<div class="form-group">
+									<label for="inputLoginUsername">E-mail*</label>
+									<input type="email" id="inputLoginUsername" name="inputLoginUsername" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginUsername.$invalid && loginForm.inputLoginUsername.$touched }" ng-model="pageSignin.credentials.username" required/>
+									<div ng-show="loginForm.inputLoginUsername.$touched">
+										<div ng-messages="loginForm.inputLoginUsername.$error">
+											<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+										</div>
+									</div>
+								</div>
+								<div class="form-group">
+									<label for="inputLoginPassword">Senha*</label>
+									<input type="password" id="inputLoginPassword" name="inputLoginPassword" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginPassword.$invalid && loginForm.inputLoginPassword.$touched }" ng-model="pageSignin.credentials.password" required>
+									<div ng-show="loginForm.inputLoginPassword.$touched">
+										<div ng-messages="loginForm.inputLoginPassword.$error">
+											<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+										</div>
+									</div>
+								</div>
+								<div class="form-group">
+									<button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-12">
+							<hr class="separator separator-or"></hr>
+
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-md-5">
+						<button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
+							<div class="border-social-icon border-social-facebook">
+								<span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
+									<!-- Facebook -->
+									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
+										<path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/>
+									</svg>
+								</span>
+							</div>
+							<span class="text">Entrar com Facebook</span>
+						</button>
+					</div>
+					<div class="col-md-5">
+						<button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
+							<div class="border-social-icon border-social-googlePlus">
+								<span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
+									<!-- Google Plus -->
+									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
+										<path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/>
+									</svg>
+								</span>
+							</div>
+							<span class="text">Entrar com Google+</span>
+						</button>
+					</div>
+				</div>
+			</div>
+			<div class="col-sm-6">
+				<div class="row">
+					<div class="col-sm-12">
+						<h2>Ou cadastre-se</h2>
+						<p>
+							Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!
+						</p>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-md-6">
+						<button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
+							<div class="border-social-icon border-social-facebook">
+								<span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
+									<!-- Google Plus -->
+									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
+										<path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/>
+									</svg>
+								</span>
+							</div>
+							<span class="text">Conectar pelo Facebook</span>
+						</button>
+					</div>
+					<div class="col-md-6">
+						<button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
+							<div class="border-social-icon border-social-googlePlus">
+								<span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
+									<!-- Google Plus -->
+									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25">
+										<path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/>
+									</svg>
+								</span>
+							</div>
+							<span class="text">Conectar pelo Google+</span>
+						</button>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-12">
+						<hr class="separator separator-cadastro"></hr>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-sm-12">
+					<form name="cadastroForm">
+						<div class="form-group">
+							<label for="inputNome">Nome:</label>
+							<span class="pull-right">*Dados obrigatórios</span>
+							<input type="text" id="inputNome" name="inputNome" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputNome.$invalid && cadastroForm.inputNome.$touched }" ng-model="nome" ng-minlength="" ng-maxlength="" required>
+							<div ng-show="cadastroForm.inputNome.$touched">
+								<div ng-messages="cadastroForm.inputNome.$error">
+									<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+								</div>
+							</div>
+						</div>
+						<div class="form-group">
+							<label for="inputEmail">E-mail*</label>
+							<input type="email" id="inputEmail" name="inputEmail" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputEmail.$invalid && cadastroForm.inputEmail.$touched }" ng-model="email" ng-minlength="" ng-maxlength="" required>
+							<div ng-show="cadastroForm.inputEmail.$touched">
+								<div ng-messages="cadastroForm.inputEmail.$error">
+									<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="form-group">
+									<label for="inputPassword">Senha:</label>
+									<input type="password" id="inputPassword" name="inputPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputPassword.$invalid && cadastroForm.inputPassword.$touched }" ng-model="senha" ng-minlength="" ng-maxlength="" required>
+									<div ng-show="cadastroForm.inputPassword.$touched">
+										<div ng-messages="cadastroForm.inputPassword.$error">
+											<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="form-group">
+									<label for="inputRepeatPassword">Confirmar Senha:</label>
+									<input type="password" id="inputRepeatPassword" name="inputRepeatPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputRepeatPassword.$invalid && cadastroForm.inputRepeatPassword.$touched }" ng-model="senhaRepetida" ng-minlength="" ng-maxlength="" required>
+									<div ng-show="cadastroForm.inputRepeatPassword.$touched">
+										<div ng-messages="cadastroForm.inputRepeatPassword.$error">
+											<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-12">
+								<span class="text">
+									A senha deve ter 6 ou mais caracteres e conter números e letras.
+								</span>
+							</div>
+						</div>
+						<div class="form-group">
+							<input type="checkbox" id="termosDeUso" name="termosDeUso" value="aceito" required>
+							Já li os
+							<a href="">Termos de Uso</a>
+							e concordo com os mesmos*
+						</input>
+						<div ng-show="cadastroForm.termosDeUso.$touched">
+							<div ng-messages="cadastroForm.termosDeUso.$error">
+								<div ng-messages-include="app/pages/geral/error-messages.html"></div>
+							</div>
+						</div>
+					</div>
+					<div class="form-group">
+						<span>Digite o texto da imagem</span>
+						<p>O Captcha vai aqui</p>
+					</div>
+					<div class="form-group">
+						<button class="btn btn-lg btn-block btn-submit" type="submit">Cadastrar</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
 </div>
 </div>
 </div>
diff --git a/src/app/pages/geral/termosDeUso.html b/src/app/pages/geral/termosDeUso.html
deleted file mode 100644
index 54c1dc2..0000000
--- a/src/app/pages/geral/termosDeUso.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<div class="modal fade modalTermosDeUso" id="termosDeUso" tabindex="-1" role="dialog" aria-labelledby="termosDeUsoLabel">
-    <div class="modal-dialog" role="document">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title" id="termosDeUsoLabel">Termos de Uso</h4>
-        </div>
-        <div class="modal-body">
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-               tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-               quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-               consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-               cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-               proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-               tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-               quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-               consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-               cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-               proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-               tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-               quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-               consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-               cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-               proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-                cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-        </div>
-      </div>
-    </div>
-  </div>
\ No newline at end of file
diff --git a/src/app/pages/propostas/cadastro-proposta.html b/src/app/pages/propostas/cadastro-proposta.html
new file mode 100644
index 0000000..0e5d7da
--- /dev/null
+++ b/src/app/pages/propostas/cadastro-proposta.html
@@ -0,0 +1,16 @@
+<div class="container">
+  <div class="row">
+    <div class="col-sm-12">
+      <!-- <div ncy-breadcrumb></div> -->
+    </div>
+  </div>
+</div>
+
+<!-- <div class="container page--propostas">
+  <h1>TODO: Home > Proposta</h1>
+</div> -->
+<section class="section-gray auth-content ng-scope">
+    <div class="container">
+        <cadastro-proposta></cadastro-proposta>
+    </div>
+</section>
\ No newline at end of file
--
libgit2 0.21.2