diff --git a/www/html/_edit_proposal.html b/www/html/_edit_proposal.html
index ff2fbf2..948b8d1 100644
--- a/www/html/_edit_proposal.html
+++ b/www/html/_edit_proposal.html
@@ -9,17 +9,8 @@
       <label class="item item-input"><input type="text" placeholder="Título" ng-model="data.title" maxlength="40"></label>
       <label class="item item-input"><textarea placeholder="Descrição" ng-model="data.description"></textarea></label>
 
-      <ng-include src="'html/_select_state.html'"></ng-include>
+      <ng-include src="'html/_select_proposal_state.html'"></ng-include>
       
-      <label id="proposal-topic">
-        <div class="input-label">
-          Eixo
-        </div>
-        <select ng-model="data.topic_id" id="select-topic" ng-value="topic.id"  ng-options="topic.title for topic in topics track by topic.id">
-          <option value="">Escolha o eixo...</option>
-        </select>
-      </label>
-
       <label class="checkbox free-conference-cbox">
         <input  type="checkbox" ng-model="data.free_conference" >
       </label>
diff --git a/www/html/_left_sidebar.html b/www/html/_left_sidebar.html
index f74b7ca..c2de371 100644
--- a/www/html/_left_sidebar.html
+++ b/www/html/_left_sidebar.html
@@ -1,7 +1,7 @@
 <div id="left-sidebar" class="sidebar" menu-toggle="left">
   <ion-content>
     <h2>
-      <span>{{user.name}}</span>
+      <span>{{profile.login}}</span>
       <button menu-toggle="left" class="button button-icon icon ion-close-circled"></button>
     </h2>
     <ul class="list" ng-show="loggedIn">
diff --git a/www/html/_proposal.html b/www/html/_proposal.html
index 0b792b2..39c1f07 100644
--- a/www/html/_proposal.html
+++ b/www/html/_proposal.html
@@ -12,16 +12,16 @@
     <span id="proposal-id" style="display: none;">{{proposal.id}}</span>
 
     <p class="proposal-buttons">
-      <button class="button tag" ng-click="openTagForm()" ng-show="proposal.author.id == user.id">
+      <button class="button tag" ng-click="openTagForm()" ng-show="proposal.author.id == profile.id">
         <i class="icon ion-pricetags"></i> <span>Adicionar Tag</span>
       </button>
-      <button class="button edit" ng-click="openEditProposalForm()" ng-show="proposal.author.id == user.id">
+      <button class="button edit" ng-click="openEditProposalForm()" ng-show="proposal.author.id == profile.id">
         <i class="icon ion-edit"></i> <span>Editar</span>
       </button>
       <button class="button comment" ng-click="openCommentForm()">
         <i class="icon ion-chatbox-working"></i> <span>Comentar</span>
       </button>
-      <button class="button follow" ng-click="follow(proposal)" ng-hide="isFollowing(proposal) || proposal.author.id == user.id">
+      <button class="button follow" ng-click="follow(proposal)" ng-hide="isFollowing(proposal) || proposal.author.id == profile.id">
         <i class="icon ion-eye"></i> <span>Seguir</span>
       </button>
       <br />
diff --git a/www/html/_proposal_list.html b/www/html/_proposal_list.html
index 39237c2..6529c6b 100644
--- a/www/html/_proposal_list.html
+++ b/www/html/_proposal_list.html
@@ -52,7 +52,7 @@
         </div>
         <div class="card-footer">
           <a ng-click="openProposal(proposal)" class="icon-left ion-android-open"> Leia Mais</a>
-          <a ng-click="follow(proposal)" class="icon-left ion-eye" ng-hide="isFollowing(proposal) || proposal.author.id == user.id"> Seguir</a>
+          <a ng-click="follow(proposal)" class="icon-left ion-eye" ng-hide="isFollowing(proposal) || proposal.author.id == profile.id"> Seguir</a>
         </div>
       </div>
     </td-card>
diff --git a/www/html/_select_city.html b/www/html/_select_city.html
index 12a6835..840290f 100644
--- a/www/html/_select_city.html
+++ b/www/html/_select_city.html
@@ -2,7 +2,7 @@
   <div class="input-label">
     Cidade
   </div>
-  <select ng-model="profile.city" ng-value="profile.city.id"  ng-options="city.name for city in cities track by city.id" class="item">
+  <select ng-model="profile.city" ng-value="city.id"  ng-options="city.name for city in cities track by city.id" class="item">
     <option value="">Escolha a cidade...</option>
   </select>
 </label>
diff --git a/www/html/_select_proposal_city.html b/www/html/_select_proposal_city.html
index fc8abbf..2a870ba 100644
--- a/www/html/_select_proposal_city.html
+++ b/www/html/_select_proposal_city.html
@@ -2,7 +2,7 @@
   <div class="input-label">
     Cidade
   </div>
-  <select ng-model="data.city" ng-value="data.city.id"  ng-options="city.name for city in cities track by city.id" class="item">
+  <select ng-model="data.city" ng-value="city.id" ng-options="city.name for city in cities track by city.id" class="item">
     <option value="">Escolha a cidade...</option>
   </select>
 </label>
diff --git a/www/html/_select_proposal_state.html b/www/html/_select_proposal_state.html
index 19a4bd9..2ed6667 100644
--- a/www/html/_select_proposal_state.html
+++ b/www/html/_select_proposal_state.html
@@ -8,4 +8,3 @@
 </label>
 
 <ng-include src="'html/_select_proposal_city.html'"></ng-include>
-
diff --git a/www/index.html b/www/index.html
index 5b7011e..f164532 100644
--- a/www/index.html
+++ b/www/index.html
@@ -35,14 +35,14 @@
 
     <ion-side-menus id="body" ng-show="!introDisplayed">
       <ion-side-menu side="left">
-        <ng-include src="'html/_left_sidebar.html'"></ng-include>
+        <ng-include src="'html/_left_sidebar.html?1'"></ng-include>
       </ion-side-menu>
 
       <ion-side-menu-content>
         <ng-include src="'html/_header.html?2'"></ng-include>
         <ion-pane>
           <ion-content id="proposals-container" no-scroll="">
-            <ng-include src="'html/_proposal_list.html?9'"></ng-include>
+            <ng-include src="'html/_proposal_list.html?10'"></ng-include>
           </ion-content>
         </ion-pane>
       </ion-side-menu-content>
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 1eb4028..23e866d 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -288,7 +288,7 @@ angular.module('confjuvapp.controllers', [])
     $scope.shouldDisplayCities = false;
 
     // Load States
-    $scope.loadStates = function() {
+    $scope.loadStates = function(selected) {
       $scope.loading = true;
       $scope.shouldDisplayCities = false;
 
@@ -297,8 +297,11 @@ angular.module('confjuvapp.controllers', [])
       $http.get(ConfJuvAppUtils.pathTo(path))
       .then(function(resp) {
         $scope.states = resp.data;
-        if($scope.profile && $scope.profile.state){
-          $scope.loadCitiesByState($scope.profile.state.id) 
+        if (selected) {
+          $scope.loadCitiesByState(selected);
+        }
+        else if ($scope.profile && $scope.profile.state && !selected) {
+          $scope.loadCitiesByState($scope.profile.state.id);
         }
         $scope.loading = false;
       }, function(err) {
@@ -450,7 +453,7 @@ angular.module('confjuvapp.controllers', [])
         perPage = 11;
       }
 
-      var params = '?private_token=' + token + '&fields=title,image,body,abstract,id,tag_list,categories,created_by&content_type=ProposalsDiscussionPlugin::Proposal&per_page=' + perPage + '&oldest=younger_than&reference_id=' + topic.lastProposalId + $scope.proposalsFilter;
+      var params = '?t=' + (new Date().getTime()) + '&private_token=' + token + '&fields=title,image,body,abstract,id,tag_list,categories,created_by&content_type=ProposalsDiscussionPlugin::Proposal&per_page=' + perPage + '&oldest=younger_than&reference_id=' + topic.lastProposalId + $scope.proposalsFilter;
 
       var path = 'articles/' + topic.id + '/children' + params;
 
@@ -535,7 +538,7 @@ angular.module('confjuvapp.controllers', [])
       }
       else {
         // Initiate the modal
-        $ionicModal.fromTemplateUrl('html/_proposal.html?16', {
+        $ionicModal.fromTemplateUrl('html/_proposal.html?17', {
           scope: $scope,
           animation: 'slide-in-up'
         }).then(function(modal) {
@@ -1028,8 +1031,7 @@ angular.module('confjuvapp.controllers', [])
         $scope.loadCitiesByState($scope.data.state.id);
       }
       else {
-        $scope.loadStates();
-        $scope.loadCitiesByState($scope.data.state.id);
+        $scope.loadStates($scope.data.state.id);
         // Initiate the modal
         $ionicModal.fromTemplateUrl('html/_edit_proposal.html', {
           scope: $scope,
@@ -1056,7 +1058,7 @@ angular.module('confjuvapp.controllers', [])
 
     // Submit the updated proposal
     $scope.updateProposal = function(data) {
-      if (!data || !data.title || !data.description || !data.topic_id) {
+      if (!data || !data.title || !data.description) {
         $scope.closeEditProposalModal();
         var popup = $ionicPopup.alert({ title: 'Alterar proposta', template: 'Por favor preencha todos os campos!' });
         popup.then(function() {
@@ -1100,24 +1102,16 @@ angular.module('confjuvapp.controllers', [])
 
         $http.post(ConfJuvAppUtils.pathTo('articles/' + $scope.proposal.id), jQuery.param(params), config)
         .then(function(resp) {
-          $scope.closeEditProposalModal();
           var popup = $ionicPopup.alert({ title: 'Alterar proposta', template: 'Proposta alterada com sucesso!' });
           popup.then(function() {
-            var topic = null;
-            for (var i = 0; i < $scope.topics.length; i++) {
-              if (data.topic_id.id == $scope.topics[i].id) {
-                topic = $scope.topics[i];
-              }
-            }
-            
             $scope.proposal.categories[0] = data.city;
             $scope.proposal.categories[1] = data.state;
             $scope.proposal.title = data.title;
             $scope.proposal.body = data.description;
-            $scope.proposal.topic = data.topic_id;
             
             $scope.loading = false;
             document.getElementById('save-proposal').innerHTML = 'Salvar';
+            $scope.closeEditProposalModal();
           });
         }, function(err) {
           $scope.closeEditProposalModal();
--
libgit2 0.21.2