diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.directive.js b/src/app/components/cadastro-proposta/cadastro-proposta.directive.js
index afa5b79..c19fb80 100644
--- a/src/app/components/cadastro-proposta/cadastro-proposta.directive.js
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.directive.js
@@ -9,22 +9,19 @@
   function cadastroProposta() {
 
     /** @ngInject */
-    function CadastroPropostaController(ArticleService, $scope, $element, $timeout, $log) {
+    function CadastroPropostaController ($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 () {
+    CadastroPropostaController.prototype.init = function () {
       // async values
       var vm = this;
 
@@ -37,10 +34,10 @@
     function attachPopover(){
       var vm = this;
 
-      vm.popover = angular.element(vm.$element.find('.texto-proposta'));
+      vm.popover = angular.element(vm.$element.find('.link-popover'));
       vm.popover.popover({
         html: true,
-        placement: 'right',
+        placement: 'bottom',
         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ê.'
@@ -50,10 +47,7 @@
     var directive = {
       restrict: 'E',
       templateUrl: 'app/components/cadastro-proposta/cadastro-proposta.html',
-      scope: {
-        programa: '=',
-        proposta: '=',
-      },
+      scope: {},
       controller: CadastroPropostaController,
       controllerAs: 'vm',
       bindToController: true
diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.html b/src/app/components/cadastro-proposta/cadastro-proposta.html
index fc2dd6e..6f93b16 100644
--- a/src/app/components/cadastro-proposta/cadastro-proposta.html
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.html
@@ -1,45 +1,40 @@
 <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
+  <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">Nome do progama</span>
+      </div>
+    </div>
+  </div>
+  <form role="form" name="testeForm" ng-submit="pageSignin.login(pageSignin.credentials)" novalidate>
+    <div class="form-group">
+      <div class="row linha-proposta">
+        <div class="col-sm-8">
+          <span>Descrição da proposta*</span>
+              <a tabindex="0" class="btn btn-link link-popover" role="button" data-toggle="popover" data-trigger="focus">?</a>
+          <textarea id="proposta" name="proposta" class="texto-proposta form-control"
+           ng-class="{ 'has-error' : testeForm.proposta.$invalid && testeForm.proposta.$touched }"
+           ng-model="proposta"
+           required ng-maxlength="200" ></textarea>
+           <form-messages field="testeForm.proposta" maxlength="'Ops, esse campo não pode ser maior que 200 caracteres.'"/>
+          <span class="pull-left">*Dados obrigatórios</span>
+          <span class="pull-right">Máx. 200 caracteres</span>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+       <div class="col-sm-4">
+        <button class="btn btn-lg btn-block btn-submit" type="submit">Enviar Proposta</button>
+      </div>
+    </div>
+  </form>
+</div>
diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.scss b/src/app/components/cadastro-proposta/cadastro-proposta.scss
index 2f5a08f..ba81c59 100644
--- a/src/app/components/cadastro-proposta/cadastro-proposta.scss
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.scss
@@ -24,4 +24,28 @@
         height: 200px;
         resize: none;
     }
+
+    .popover .fade .right .in {
+        top: 0px!important;
+    }
+
+    .popover-content {
+        width: 300px;
+    }
+
+    .popover-title {
+        display: none;
+    }
+
+    .btn-question {
+        color: #484848;
+        background-color: #fff;
+        display: inline-block;
+        text-align: center;
+        width: 22px;
+        height: 22px;
+        margin-left: 10px;
+        padding: 0;
+        border-radius: 10px;
+    }
 }
diff --git a/src/app/components/form-messages/form-messages.directive.js b/src/app/components/form-messages/form-messages.directive.js
new file mode 100644
index 0000000..790336a
--- /dev/null
+++ b/src/app/components/form-messages/form-messages.directive.js
@@ -0,0 +1,52 @@
+(function() {
+  'use strict';
+
+  angular
+  .module('dialoga')
+  .directive('formMessages', formMessages);
+
+  /** @ngInject */
+  function formMessages() {
+
+    /** @ngInject */
+    function FormMessagesController($log) {
+      $log.debug('FormMessagesController');
+
+      var vm = this;
+      vm.$log = $log;
+
+      vm.init();
+
+    }
+
+    FormMessagesController.prototype.init = function () {
+      // async values
+      var vm = this;
+
+      if (!vm.required) {vm.required = "Ops, o campo é obrigatório."};
+      if (!vm.minlength) {vm.minlength = "O campo deve ser maior."};
+      if (!vm.maxlength) {vm.maxlength = "O campo deve ser menor"};
+      if (!vm.email) {vm.email = "O endereço de e-mail deve ser válido"};
+
+    };
+
+    var directive = {
+      restrict: 'E',
+      templateUrl: 'app/components/form-messages/form-messages.html',
+      scope: {
+        field: '=',
+        required: '=',
+        minlength: '=',
+        maxlength: '=',
+        email: '='
+      },
+      controller: FormMessagesController,
+      controllerAs: 'vm',
+      bindToController: true
+    };
+
+    return directive;
+  }
+
+})();
+
diff --git a/src/app/components/form-messages/form-messages.html b/src/app/components/form-messages/form-messages.html
new file mode 100644
index 0000000..259cdcb
--- /dev/null
+++ b/src/app/components/form-messages/form-messages.html
@@ -0,0 +1,10 @@
+<div ng-show="vm.field.$touched">
+  <div ng-messages="vm.field.$error">
+    <div class="error-message">
+      <div ng-message="required">{{vm.required}}</div>
+      <div ng-message="minlength">{{vm.minlength}}</div>
+      <div ng-message="maxlength">{{vm.maxlength}}</div>
+      <div ng-message="email">{{vm.email}}</div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/components/form-messages/form-messages.scss b/src/app/components/form-messages/form-messages.scss
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/app/components/form-messages/form-messages.scss
diff --git a/src/app/components/proposal-list/proposal-list.html b/src/app/components/proposal-list/proposal-list.html
index c0ea74f..c013470 100644
--- a/src/app/components/proposal-list/proposal-list.html
+++ b/src/app/components/proposal-list/proposal-list.html
@@ -9,7 +9,8 @@
         <tr>
           <th>
             Colocação
-            <button type="button" class="btn btn-link btn-question">?</button>
+            <!-- <button type="button" class="btn btn-link btn-question">?</button> -->
+            <a tabindex="0" class="btn btn-link btn-questionr" role="button" data-toggle="popover" data-trigger="focus">?</a>
           </th>
           <th>123 PROPOSTAS</th>
         </tr>
diff --git a/src/app/components/show-message/message.html b/src/app/components/show-message/message.html
index 6fa8269..5bb7b60 100644
--- a/src/app/components/show-message/message.html
+++ b/src/app/components/show-message/message.html
@@ -1,21 +1,17 @@
-<div
-	id="message"
-	class="show-message">
-	<div class="row">
-		<div class="col-sm-1 col-sm-offset-2">
-			<div class="message-border {{ ::vm.type }}">
-				<span
-					class="glyphicon glyphicon-ok icon-white"
-					aria-hidden="true"></span>
-			</div>
-		</div>
-		<div class="col-sm-4">
-			<h3>{{ ::vm.title }}</h3>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-sm-8 col-sm-offset-3">
-			<h5>{{ ::vm.message }}</h5>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+<div id="message" class="show-message">
+  <div class="row">
+  <div class="div-center">
+    <div class="col-sm-2 col-sm-offset-2 message-border {{ ::vm.type }}">
+      <span class="glyphicon glyphicon-ok icon-white" aria-hidden="true"></span>
+    </div>
+  </div>
+    <div class="col-sm-7  div-mensagem">
+      <div class="row">
+        <h3>{{ ::vm.title }}</h3>
+      </div>
+      <div class="row">
+        <h5>{{ ::vm.message }}</h5>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/components/show-message/show-message.scss b/src/app/components/show-message/show-message.scss
index d098b8c..a4de68b 100644
--- a/src/app/components/show-message/show-message.scss
+++ b/src/app/components/show-message/show-message.scss
@@ -11,8 +11,16 @@
     .success {
       background-color: #8AB34D;
     }
-    
+
     .error {
       background-color: #C93E55;
     }
+
+    .div-center {
+        text-align: center;
+    }
+
+    .div-mensagem {
+        margin-left: 30px;
+    }
 }
diff --git a/src/app/index.route.js b/src/app/index.route.js
index 7b209dc..c684542 100644
--- a/src/app/index.route.js
+++ b/src/app/index.route.js
@@ -138,7 +138,7 @@
           'header': { templateUrl: 'app/pages/header/header.html' },
           'main': {
             templateUrl: 'app/pages/propostas/cadastro-proposta.html',
-            controller: 'CadastroPropostaController',
+            controller: 'PropostasPageController',
             controllerAs: 'pagePropostas'
           },
           'footer': { templateUrl: 'app/pages/footer/footer.html' }
diff --git a/src/app/pages/auth/error-messages.html b/src/app/pages/auth/error-messages.html
new file mode 100644
index 0000000..996583e
--- /dev/null
+++ b/src/app/pages/auth/error-messages.html
@@ -0,0 +1,6 @@
+<div class="error-message">
+	<div ng-message="required" >Ops, o campo é obrigatório.</div>
+	<div ng-message="minlength">O campo deve ser maior.</div>
+	<div ng-message="maxlength">O campo deve ser menor</div>
+	<div ng-message="email">O endereço de e-mail deve ser válido</div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/auth/message.html b/src/app/pages/auth/message.html
index fe26268..fba3094 100644
--- a/src/app/pages/auth/message.html
+++ b/src/app/pages/auth/message.html
@@ -3,7 +3,7 @@
 	class="section-gray auth-content">
 	<div class="container">
 		<show-message
-			type="'error'"
+			type="'success'"
 			title="'Cadastro efetuado com sucesso :)'"
 			message="'Agora você faz parte do Dialoga Brasil. Você será redirecionado para a página (página) em 10 segundos'"></show-message>
 	</div>
@@ -59,4 +59,4 @@
 			</div>
 		</div>
 	</div>
-</section>
\ No newline at end of file
+</section>
diff --git a/src/app/pages/auth/signin.html b/src/app/pages/auth/signin.html
index 0e79d32..b1f5221 100644
--- a/src/app/pages/auth/signin.html
+++ b/src/app/pages/auth/signin.html
@@ -1,208 +1,188 @@
 <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 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>
-</section>
\ No newline at end of file
+  <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/>
+                  <form-messages field="loginForm.inputLoginUsername"></show-message>
+                </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>
+                  <form-messages field="loginForm.inputLoginPassword" ></show-message>
+                </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 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>
+                    <form-messages field="cadastroForm.inputNome" ></show-message>
+                  </div>
+                  <div class="form-group">
+                    <p>Descrição da proposta*</p>
+                    <textarea id="proposta" name="proposta" class="texto-proposta form-control"  ng-class="{ 'has-error' : cadastroForm.proposta.$invalid && cadastroForm.proposta.$touched }" ng-model="vm.proposta" required ng-maxlength="200" ></textarea>
+                    <div ng-show="cadastroForm.proposta.$touched">
+                      <div ng-messages="cadastroForm.proposta.$error">
+                        <form-messages field="cadastroForm.proposta" ></show-message>
+                      </div>
+                    </div>
+                    <span class="pull-left">*Dados obrigatórios</span>
+                    <span class="pull-right">Máx. 200 caracteres</span>
+                  </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>
+                    <form-messages field="cadastroForm.inputEmail" ></show-message>
+                  </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>
+                        <form-messages field="cadastroForm.inputPassword" ></show-message>
+                      </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>
+                        <form-messages field="cadastroForm.inputRepeatPassword" ></show-message>
+                      </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"  ng-model="termosDeUso" required>
+                    Já li os
+                    <a href="">Termos de Uso</a>
+                    e concordo com os mesmos*
+                  </input>
+                  <form-messages field="cadastroForm.termosDeUso" ></show-message>
+                </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 " ng-class=" {'disabled' : !termosDeUso }"type="submit">Cadastrar</button>
+                </div>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js
index 13beabb..19e7f26 100644
--- a/src/app/pages/propostas/propostas.controller.js
+++ b/src/app/pages/propostas/propostas.controller.js
@@ -26,7 +26,7 @@
     vm.loading = true;
     vm.error = false;
 
-    vm.loadData();
+    // vm.loadData();
   };
 
 
diff --git a/src/assets/images/icons/sprite.png b/src/assets/images/icons/sprite.png
index 99f2296..f7e1a7f 100644
Binary files a/src/assets/images/icons/sprite.png and b/src/assets/images/icons/sprite.png differ
--
libgit2 0.21.2