diff --git a/js/main.js b/js/main.js
index 42ded88..0849aad 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,5 +1,6 @@
 define(['handlebars'], function(Handlebars){
 
+
   /* global Handlebars, $ */
   // The template code
   var templateSource = document.getElementById('proposal-template').innerHTML;
@@ -41,7 +42,7 @@ define(['handlebars'], function(Handlebars){
       $('.login-container').html(loginTemplate());
       $('.countdown').maxlength({text: '%left caracteres restantes'});
 
-      navigateTo(window.location.hash);
+      Main.navigateTo(window.location.hash);
 
       //Actions for links
       $( '#nav-proposal-categories a' ).on('click touchstart', function(e){
@@ -50,7 +51,7 @@ define(['handlebars'], function(Handlebars){
         var $link = $(this);
 
         // Update URL and Navigate
-        updateHash($link.attr('href'));
+        Main.updateHash($link.attr('href'));
       });
 
       $( '#nav-proposal-group a' ).on('click touchstart', function(e){
@@ -59,7 +60,7 @@ define(['handlebars'], function(Handlebars){
         var $link = $(this);
 
         // Update URL and Navigate
-        updateHash($link.attr('href'));
+        Main.updateHash($link.attr('href'));
       });
 
       $( '.proposal-item a' ).on('click touchstart', function(e){
@@ -68,7 +69,7 @@ define(['handlebars'], function(Handlebars){
         var $link = $(this);
 
         // Update URL and Navigate
-        updateHash($link.attr('href'));
+        Main.updateHash($link.attr('href'));
       });
 
       $( '.proposal-category a' ).on('click touchstart', function(e){
@@ -77,7 +78,7 @@ define(['handlebars'], function(Handlebars){
         var $link = $(this);
 
         // Update URL and Navigate
-        updateHash($link.attr('href'));
+        Main.updateHash($link.attr('href'));
       });
 
       $( '.proposal-category .go-back' ).on('click touchstart', function(e){
@@ -94,7 +95,7 @@ define(['handlebars'], function(Handlebars){
         }
 
         // Update URL and Navigate
-        updateHash(newHash);
+        Main.updateHash(newHash);
       });
 
       $( '.send-button a' ).on('click touchstart', function(e){
@@ -105,7 +106,7 @@ define(['handlebars'], function(Handlebars){
         loginButton = $this.parents('.send-button');
         loginButton.hide();
         $this.parents('.success-proposal-sent').hide();
-        loginCallback(logged_in);
+        Main.loginCallback(logged_in);
       });
 
       $( '#display-contrast' ).on('click touchstart', function(e){
@@ -119,7 +120,7 @@ define(['handlebars'], function(Handlebars){
         var $link = $(this);
 
         // Update URL and Navigate
-        updateHash($link.attr('href'));
+        Main.updateHash($link.attr('href'));
       });
 
       $( '.go-to-proposal-button a' ).on('click touchstart', function(e){
@@ -128,13 +129,13 @@ define(['handlebars'], function(Handlebars){
         var $link = $(this);
 
         // Update URL and Navigate
-        updateHash($link.attr('href'));
+        Main.updateHash($link.attr('href'));
       });
 
       $( '.proposal-selection' ).change(function(e){
         e.preventDefault();
 
-        display_proposal('proposal-item-' + this.value);
+        Main.display_proposal('proposal-item-' + this.value);
       });
 
       var availableTags = [ ];
@@ -189,96 +190,356 @@ define(['handlebars'], function(Handlebars){
       console.log( 'Request Failed: ' + err );
     });
 
-  function loadRandomProposal(topic_id, private_token) {
-    var $noProposals = $('.no-proposals');
-    var $loading = $('.loading');
-    var $randomProposal = $('.random-proposal');
-    var $body = $(document.body);
-
-    // reset view
-    $noProposals.hide();
-    $loading.show();
-    $randomProposal.html('');
-
-    var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
-    $.getJSON(url).done(function( data ) {
-      $loading.hide();
-
-      if(data.articles.length === 0) {
-        $noProposals.show();
-        return;
+    var BARRA_ADDED = false;
+    var HIDE_BARRA_DO_GOVERNO = false;
+
+    var Main = (function(){
+
+      return {
+        loadRandomProposal: function (topic_id, private_token) {
+            var $noProposals = $('.no-proposals');
+            var $loading = $('.loading');
+            var $randomProposal = $('.random-proposal');
+            var $body = $(document.body);
+            var contextMain = this;
+
+            // reset view
+            $noProposals.hide();
+            $loading.show();
+            $randomProposal.html('');
+
+            var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
+            $.getJSON(url).done(function( data ) {
+              $loading.hide();
+
+              if(data.articles.length === 0) {
+                $noProposals.show();
+                return;
+              }
+
+              var article = data.articles[0];
+              $randomProposal.html(supportProposalTemplate(article));
+              $body.off('click', '.vote-actions .skip');
+              $body.on('click', '.vote-actions .skip', function(e) {
+                contextMain.loadRandomProposal(topic_id, private_token);
+                e.preventDefault();
+              });
+              $body.off('click', '.vote-actions .like');
+              $body.on('click', '.vote-actions .like', function(e) {
+                //Helps to prevent more than one vote per proposal
+                if(contextMain.hasProposalbeenVoted(article.id)){
+                  console.log("Proposta " + article.id + " já havia sido votada");
+                  contextMain.loadRandomProposal(topic_id, private_token);
+                  e.preventDefault();
+                  return;
+                }
+                $.ajax({
+                  type: 'post',
+                  url: host + '/api/v1/articles/' + article.id + '/vote',
+                  data: {
+                    value: $(this).data('vote-value'),
+                    private_token: private_token
+                  }
+                }).done(function( /*data*/ ) {
+                  contextMain.addVotedProposal(article.id);
+                  contextMain.loadRandomProposal(topic_id, private_token);
+                });
+                e.preventDefault();
+              });
+
+              $body.off('click', '.vote-result');
+              $body.on('click', '.vote-result', function(e) {
+
+                var $this = $(this);
+                var $proposalDetail = $this.parents('.proposal-detail');
+                var $resultsContainer = $proposalDetail.find('.results-container');
+
+                // $resultsContainer.toggle();
+                // $resultsContainer.toggleClass('hide');
+
+                if($resultsContainer.css('display') === 'none') {
+
+                  $resultsContainer.find('.loading').show();
+                  $resultsContainer.find('.results-content').hide();
+
+                  var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=10&order=votes_score&fields=id,name,abstract,votes_for,votes_against&content_type=ProposalsDiscussionPlugin::Proposal';
+                  $.getJSON(url).done(function( data ) {
+
+                    $resultsContainer.html(resultsTemplate(data));
+                    $resultsContainer.find('.loading').hide();
+                    $resultsContainer.find('.results-content').show();
+                    $resultsContainer.show();
+
+                    // scroll to the end
+                    $('html, body').animate({
+                      scrollTop: $(document).height()
+                    }, 'fast');
+                  });
+                  $('.experience-proposal-container').hide();
+                  $('.talk-proposal-container').hide();
+                } else {
+                  $('.experience-proposal-container').show();
+                  $('.talk-proposal-container').show();
+                  $resultsContainer.hide();
+                }
+
+                e.preventDefault();
+              });
+            });
+          },
+
+          loginCallback: function(loggedIn, token) {
+            logged_in = loggedIn;
+            $('.login .message').text('');
+
+            if(logged_in) {
+              if(token){
+                private_token = token;
+              }
+              loginButton.siblings('.save-article-form').show();
+              loginButton.siblings('.save-article-form .message').show();
+              loginButton.siblings('.login-container').hide();
+              $.cookie('_dialoga_session', private_token);
+            } else {
+              loginButton.siblings('.save-article-form').hide();
+              loginButton.siblings('.login-container').show();
+            }
+          },
+          oauthPluginHandleLoginResult: function(loggedIn, token) {
+            loginCallback(loggedIn, token);
+          },
+          guid: function() {
+            function s4() {
+              return Math.floor((1 + Math.random()) * 0x10000)
+                .toString(16)
+                .substring(1);
+            }
+          },
+          display_category_tab: function(){
+            $('#proposal-group').hide();
+            $('#proposal-categories').show();
+            $('#nav-proposal-categories a').addClass('active');
+            $('#nav-proposal-group a').removeClass('active');
+            $('.proposal-category-items').hide();
+            $('.proposal-category .arrow-box').hide();
+            $('.proposal-detail').hide();
+
+            $('#content').show();
+            $('nav').show();
+          },
+          display_proposals_tab: function(){
+            $('#proposal-categories').hide();
+            $('#proposal-group').show();
+            $('#nav-proposal-group a').addClass('active');
+            $('#nav-proposal-categories a').removeClass('active');
+            $('#content').show();
+            $('nav').show();
+          },
+          display_proposal: function(proposal_id){
+            $('#proposal-categories').hide();
+            $('#proposal-group').hide();
+            $('nav').hide();
+            $('#content').hide();
+            $('.make-proposal-form').hide();
+            $('.login-container').hide();
+            $('.proposal-detail').hide();
+            $('.proposal-detail-base').hide();
+            $('#' + proposal_id).show();
+            $('.proposal-header').show();
+            $('.make-proposal-container').show();
+            $('.support-proposal-container').show();
+            $('.results-container').hide();
+            $('.results-container .loading').hide();
+            $('.results-container .results-content').hide();
+            $('.experience-proposal-container').show();
+            $('.talk-proposal-container').show();
+            var topic_id = proposal_id.split('-').pop();
+            this.loadRandomProposal(topic_id, private_token);
+          },
+          display_proposal_detail: function(proposal_id){
+            $('#proposal-categories').hide();
+            $('#proposal-group').hide();
+            $('nav').hide();
+            $('#content').hide();
+            $('.make-proposal-form').hide();
+            $('.proposal-header').hide();
+            $('.make-proposal-container').hide();
+            $('.support-proposal-container').hide();
+            $('.results-container').hide();
+            $('.experience-proposal-container').hide();
+            $('.talk-proposal-container').hide();
+            $('.body').show();
+
+            var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
+            $.getJSON(url).done(function( data ) {
+              $('.body-content').replaceWith(data.article.body);
+            })
+            .fail(function( jqxhr, textStatus, error ) {
+              var err = textStatus + ', ' + error;
+              console.log( 'Request Failed: ' + err );
+            });
+          },
+          display_proposal_by_category: function(item){
+            var $item = $('#' + item);
+
+            if($item.hasClass('proposal-category-items')){
+              //Display Topics or Discussion by category
+              $('nav').show();
+              $('#content').show();
+              $('#proposal-categories').show();
+              $('#nav-proposal-categories a').addClass('active');
+              $('#nav-proposal-group a').removeClass('active');
+              $('.proposal-category-items').hide();
+              $('.proposal-detail').hide();
+              $item.toggle( 'blind', 1000 );
+              $('.proposal-category .arrow-box').hide();
+              var categorySlug = $item.data('category');
+              $('#proposal-category-' + categorySlug).find('.arrow-box').show();
+            }
+          },
+          addBarraDoGoverno: function(){
+
+            if( BARRA_ADDED ) { return; }
+
+            var HTML_BODY_PREPEND = '' +
+              '<div id="barra-brasil" style="background:#7F7F7F; height: 20px; padding:0 0 0 10px;display:block;"> ' +
+                '<ul id="menu-barra-temp" style="list-style:none;">' +
+                  '<li style="display:inline; float:left;padding-right:10px; margin-right:10px; border-right:1px solid #EDEDED"><a href="http://brasil.gov.br" style="font-family:sans,sans-serif; text-decoration:none; color:white;">Portal do Governo Brasileiro</a></li> ' +
+                  '<li><a style="font-family:sans,sans-serif; text-decoration:none; color:white;" href="http://epwg.governoeletronico.gov.br/barra/atualize.html">Atualize sua Barra de Governo</a></li>' +
+                '</ul>' +
+              '</div>';
+
+            var HTML_BODY_APPEND = ''+
+              '<div id="footer-brasil"></div>' +
+              '<script defer="defer" src="http://barra.brasil.gov.br/barra.js" type="text/javascript"></script>';
+
+            var STYLE_TEMA_AZUL = '' +
+              '<style>'+
+                '#footer-brasil {'+
+                 'background: none repeat scroll 0% 0% #0042b1;'+
+                 'padding: 1em 0px;'+
+                 'max-width: 100%;'+
+                 'margin-top: 40px;'+
+                '}'+
+                '#barra-brasil ul {'+
+                  'width: auto;'+
+                '}'+
+              '<style>';
+
+            var $body = $(document.body);
+            $body.prepend(HTML_BODY_PREPEND);
+            $body.append(HTML_BODY_APPEND);
+            $body.append(STYLE_TEMA_AZUL);
+
+            BARRA_ADDED = true;
+          },
+          updateHash: function(hash){
+            var id = hash.replace(/^.*#/, '');
+            var elem = document.getElementById(id);
+
+            // preserve the query param
+            // if (HIDE_BARRA_DO_GOVERNO && (hash.indexOf('?barra=false') === -1)){
+            //   hash += '?barra=false';
+            // }
+
+            if ( !elem ) {
+              window.location.hash = hash;
+              return;
+            }
+
+            elem.id = id+'-tmp';
+            window.location.hash = hash;
+            elem.id = id;
+          },
+          locationHashChanged: function(){
+            var hash = window.location.hash;
+            this.navigateTo(hash);
+          },
+          navigateTo: function(hash){
+            var regexProposals = /#\/programas/;
+            var regexCategory = /#\/temas/;
+            var regexHideBarra = /barra=false$/;
+
+            if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){
+              this.addBarraDoGoverno();
+            }else{
+              HIDE_BARRA_DO_GOVERNO = true;
+            }
+
+            // remove query params
+            hash = hash.split('?')[0];
+
+            var parts = hash.split('/');
+
+            var isProposal = regexProposals.exec(hash) !== null;
+            var isCategory = regexCategory.exec(hash) !== null;
+
+            if( isProposal ){
+
+              // go to proposal
+              var proposalId = parts[2];
+              this.navigateToProposal(proposalId);
+            }
+
+            if( isCategory ){
+
+              // go to category
+              var categoryId = parts[3];
+              this.navigateToCategory(categoryId);
+            }
+
+            // default
+            if( !isProposal && !isCategory ){
+              // show the 'index' -> category tab
+              this.display_category_tab();
+            }
+
+            $('html, body').animate({ scrollTop: 0 }, 'fast');
+          },
+          navigateToProposal: function(proposalId){
+            if(proposalId === undefined){
+              this.display_proposals_tab();
+            }else{
+              this.display_proposal('proposal-item-' + proposalId);
+
+              // show sub-page
+              var regexSubpages = /sobre-o-programa$/;
+              var m;
+              if((m = regexSubpages.exec(window.location.hash)) !== null ){
+                this.display_proposal_detail(proposalId);
+              }
+            }
+          },
+          navigateToCategory: function(categoryId){
+            if(categoryId === undefined){
+              this.display_category_tab();
+            }else{
+              this.display_proposal_by_category('proposal-item-' + categoryId);
+            }
+          },
+          addVotedProposal: function(id) {
+           var votedProposals;
+           if (typeof($.cookie("votedProposals")) == "undefined"){
+             votedProposals = [];
+           }
+           else{
+             votedProposals = JSON.parse($.cookie("votedProposals"));
+           }
+           if (votedProposals.indexOf(id)==-1){
+             votedProposals.push(id);
+           }
+           $.cookie("votedProposals", JSON.stringify(votedProposals), {expires : 999 }) ;
+         },
+         hasProposalbeenVoted: function(id) {
+           if (typeof($.cookie("votedProposals")) == "undefined") {
+             return false;
+           }
+           votedProposals = JSON.parse($.cookie("votedProposals"));
+           return votedProposals.indexOf(id)!=-1;
+         }
       }
+    })();
 
-      var article = data.articles[0];
-      $randomProposal.html(supportProposalTemplate(article));
-      $body.off('click', '.vote-actions .skip');
-      $body.on('click', '.vote-actions .skip', function(e) {
-        loadRandomProposal(topic_id, private_token);
-        e.preventDefault();
-      });
-      $body.off('click', '.vote-actions .like');
-      $body.on('click', '.vote-actions .like', function(e) {
-        //Helps to prevent more than one vote per proposal
-        if(hasProposalbeenVoted(article.id)){
-          console.log("Proposta " + article.id + " já havia sido votada");
-          loadRandomProposal(topic_id, private_token);
-          e.preventDefault();
-          return;
-        }
-        $.ajax({
-          type: 'post',
-          url: host + '/api/v1/articles/' + article.id + '/vote',
-          data: {
-            value: $(this).data('vote-value'),
-            private_token: private_token
-          }
-        }).done(function( /*data*/ ) {
-          addVotedProposal(article.id);
-          loadRandomProposal(topic_id, private_token);
-        });
-        e.preventDefault();
-      });
-
-      $body.off('click', '.vote-result');
-      $body.on('click', '.vote-result', function(e) {
-
-        var $this = $(this);
-        var $proposalDetail = $this.parents('.proposal-detail');
-        var $resultsContainer = $proposalDetail.find('.results-container');
-
-        // $resultsContainer.toggle();
-        // $resultsContainer.toggleClass('hide');
-
-        if($resultsContainer.css('display') === 'none') {
-
-          $resultsContainer.find('.loading').show();
-          $resultsContainer.find('.results-content').hide();
-
-          var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=10&order=votes_score&fields=id,name,abstract,votes_for,votes_against&content_type=ProposalsDiscussionPlugin::Proposal';
-          $.getJSON(url).done(function( data ) {
-
-            $resultsContainer.html(resultsTemplate(data));
-            $resultsContainer.find('.loading').hide();
-            $resultsContainer.find('.results-content').show();
-            $resultsContainer.show();
-
-            // scroll to the end
-            $('html, body').animate({
-              scrollTop: $(document).height()
-            }, 'fast');
-          });
-          $('.experience-proposal-container').hide();
-          $('.talk-proposal-container').hide();
-        } else {
-          $('.experience-proposal-container').show();
-          $('.talk-proposal-container').show();
-          $resultsContainer.hide();
-        }
-
-        e.preventDefault();
-      });
-    });
-  }
 
   $(document).ready(function($) {
     if($.cookie('_dialoga_session')) {
@@ -310,278 +571,29 @@ define(['handlebars'], function(Handlebars){
     });
   });
 
-  function loginCallback(loggedIn, token) {
-    logged_in = loggedIn;
-    $('.login .message').text('');
-
-    if(logged_in) {
-      if(token){
-        private_token = token;
-      }
-      loginButton.siblings('.save-article-form').show();
-      loginButton.siblings('.save-article-form .message').show();
-      loginButton.siblings('.login-container').hide();
-      $.cookie('_dialoga_session', private_token);
-    } else {
-      loginButton.siblings('.save-article-form').hide();
-      loginButton.siblings('.login-container').show();
-    }
-  }
-
-  function oauthPluginHandleLoginResult(loggedIn, token) {
-    loginCallback(loggedIn, token);
-  }
-
-  function guid() {
-    function s4() {
-      return Math.floor((1 + Math.random()) * 0x10000)
-        .toString(16)
-        .substring(1);
-    }
-  }
-
-  function display_category_tab(){
-    $('#proposal-group').hide();
-    $('#proposal-categories').show();
-    $('#nav-proposal-categories a').addClass('active');
-    $('#nav-proposal-group a').removeClass('active');
-    $('.proposal-category-items').hide();
-    $('.proposal-category .arrow-box').hide();
-    $('.proposal-detail').hide();
-
-    $('#content').show();
-    $('nav').show();
-  }
-
-  function display_proposals_tab(){
-    $('#proposal-categories').hide();
-    $('#proposal-group').show();
-    $('#nav-proposal-group a').addClass('active');
-    $('#nav-proposal-categories a').removeClass('active');
-    $('#content').show();
-    $('nav').show();
-  }
-
-  function display_proposal(proposal_id){
-    $('#proposal-categories').hide();
-    $('#proposal-group').hide();
-    $('nav').hide();
-    $('#content').hide();
-    $('.make-proposal-form').hide();
-    $('.login-container').hide();
-    $('.proposal-detail').hide();
-
-    $('.proposal-detail-base').hide();
-    $('#' + proposal_id).show();
-    $('.proposal-header').show();
-    $('.make-proposal-container').show();
-    $('.support-proposal-container').show();
-    $('.results-container').hide();
-    $('.results-container .loading').hide();
-    $('.results-container .results-content').hide();
-    $('.experience-proposal-container').show();
-    $('.talk-proposal-container').show();
-
-    var topic_id = proposal_id.split('-').pop();
-    loadRandomProposal(topic_id, private_token);
-  }
-
-  function display_proposal_detail(proposal_id){
-    $('#proposal-categories').hide();
-    $('#proposal-group').hide();
-    $('nav').hide();
-    $('#content').hide();
-    $('.make-proposal-form').hide();
-    $('.proposal-header').hide();
-    $('.make-proposal-container').hide();
-    $('.support-proposal-container').hide();
-    $('.results-container').hide();
-    $('.experience-proposal-container').hide();
-    $('.talk-proposal-container').hide();
-    $('.body').show();
-
-    var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
-    $.getJSON(url).done(function( data ) {
-      $('.body-content').replaceWith(data.article.body);
-    })
-    .fail(function( jqxhr, textStatus, error ) {
-      var err = textStatus + ', ' + error;
-      console.log( 'Request Failed: ' + err );
-    });
-  }
-  function display_proposal_by_category(item){
-    var $item = $('#' + item);
-
-    if($item.hasClass('proposal-category-items')){
-      //Display Topics or Discussion by category
-      $('nav').show();
-      $('#content').show();
-      $('#proposal-categories').show();
-      $('#nav-proposal-categories a').addClass('active');
-      $('#nav-proposal-group a').removeClass('active');
-      $('.proposal-category-items').hide();
-      $('.proposal-detail').hide();
-      $item.toggle( 'blind', 1000 );
-      $('.proposal-category .arrow-box').hide();
-      var categorySlug = $item.data('category');
-      $('#proposal-category-' + categorySlug).find('.arrow-box').show();
-    }
-  }
-
-  var BARRA_ADDED = false;
-  function addBarraDoGoverno(){
-    
-    if( BARRA_ADDED ) { return; }
-
-    var HTML_BODY_PREPEND = '' +
-      '<div id="barra-brasil" style="background:#7F7F7F; height: 20px; padding:0 0 0 10px;display:block;"> ' +
-        '<ul id="menu-barra-temp" style="list-style:none;">' +
-          '<li style="display:inline; float:left;padding-right:10px; margin-right:10px; border-right:1px solid #EDEDED"><a href="http://brasil.gov.br" style="font-family:sans,sans-serif; text-decoration:none; color:white;">Portal do Governo Brasileiro</a></li> ' +
-          '<li><a style="font-family:sans,sans-serif; text-decoration:none; color:white;" href="http://epwg.governoeletronico.gov.br/barra/atualize.html">Atualize sua Barra de Governo</a></li>' +
-        '</ul>' +
-      '</div>';
-
-    var HTML_BODY_APPEND = ''+
-      '<div id="footer-brasil"></div>' +
-      '<script defer="defer" src="http://barra.brasil.gov.br/barra.js" type="text/javascript"></script>';
-
-    var STYLE_TEMA_AZUL = '' +
-      '<style>'+
-        '#footer-brasil {'+
-         'background: none repeat scroll 0% 0% #0042b1;'+
-         'padding: 1em 0px;'+
-         'max-width: 100%;'+
-         'margin-top: 40px;'+
-        '}'+
-        '#barra-brasil ul {'+
-          'width: auto;'+
-        '}'+
-      '<style>';
-
-    var $body = $(document.body);
-    $body.prepend(HTML_BODY_PREPEND);
-    $body.append(HTML_BODY_APPEND);
-    $body.append(STYLE_TEMA_AZUL);
-
-    BARRA_ADDED = true;
-  }
 
-  function updateHash(hash){
-    var id = hash.replace(/^.*#/, '');
-    var elem = document.getElementById(id);
 
-    // preserve the query param
-    // if (HIDE_BARRA_DO_GOVERNO && (hash.indexOf('?barra=false') === -1)){
-    //   hash += '?barra=false';
-    // }
 
-    if ( !elem ) {
-      window.location.hash = hash;
-      return;
-    }
 
-    elem.id = id+'-tmp';
-    window.location.hash = hash;
-    elem.id = id;
-  }
 
-  function locationHashChanged(){
-    var hash = window.location.hash;
-    navigateTo(hash);
-  }
 
-  var HIDE_BARRA_DO_GOVERNO = false;
-  function navigateTo(hash){
-    var regexProposals = /#\/programas/;
-    var regexCategory = /#\/temas/;
-    var regexHideBarra = /barra=false$/;
 
-    if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){
-      addBarraDoGoverno();
-    }else{
-      HIDE_BARRA_DO_GOVERNO = true;
-    }
 
-    // remove query params
-    hash = hash.split('?')[0];
 
-    var parts = hash.split('/');
 
-    var isProposal = regexProposals.exec(hash) !== null;
-    var isCategory = regexCategory.exec(hash) !== null;
 
-    if( isProposal ){
-
-      // go to proposal
-      var proposalId = parts[2];
-      navigateToProposal(proposalId);
-    }
 
-    if( isCategory ){
-
-      // go to category
-      var categoryId = parts[3];
-      navigateToCategory(categoryId);
-    }
-
-    // default
-    if( !isProposal && !isCategory ){
-      // show the 'index' -> category tab
-      display_category_tab();
-    }
-
-    $('html, body').animate({ scrollTop: 0 }, 'fast');
-  }
+  if('onhashchange' in window){
 
-  function navigateToProposal(proposalId){
-    if(proposalId === undefined){
-      display_proposals_tab();
-    }else{
-      display_proposal('proposal-item-' + proposalId);
-
-      // show sub-page
-      var regexSubpages = /sobre-o-programa$/;
-      var m;
-      if((m = regexSubpages.exec(window.location.hash)) !== null ){
-        display_proposal_detail(proposalId);
-      }
+    window.onhashchange = function(){
+      Main.locationHashChanged.apply(Main);
     }
-  }
 
-  function navigateToCategory(categoryId){
-    if(categoryId === undefined){
-      display_category_tab();
-    }else{
-      display_proposal_by_category('proposal-item-' + categoryId);
-    }
+  }else{
+    console.log('The browser not supports the hashchange event!');
   }
 
-  function addVotedProposal(id) {
-    var votedProposals;
-    if (typeof($.cookie("votedProposals")) == "undefined"){
-      votedProposals = [];
-    }
-    else{
-      votedProposals = JSON.parse($.cookie("votedProposals"));
-    }
-    if (votedProposals.indexOf(id)==-1){
-      votedProposals.push(id);
-    }
-    $.cookie("votedProposals", JSON.stringify(votedProposals), {expires : 999 }) ;
-  }
 
-  function hasProposalbeenVoted(id) {
-    if (typeof($.cookie("votedProposals")) == "undefined") {
-      return false;
-    }
-    votedProposals = JSON.parse($.cookie("votedProposals"));
-    return votedProposals.indexOf(id)!=-1;
-  }
 
-  if('onhashchange' in window){
-    window.onhashchange = locationHashChanged;
-  }else{
-    console.log('The browser not supports the hashchange event!');
-  }
 
 });
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
index 5729285..6041417 100644
--- a/test/SpecRunner.html
+++ b/test/SpecRunner.html
@@ -14,12 +14,47 @@
   <script src="lib/jasmine-2.2.0/jasmine-html.js"></script>
   <script src="lib/jasmine-2.2.0/boot.js"></script>
 
-  <!-- include source files here... -->
-  <script src="../js/main.js"></script>
+  <script type="text/javascript">
+
+        var require = {
+            paths: {
+                "domReady": "lib/requirejs-plugins/domReady",
+                "model": "../js"
+            }
+        };
+
+    </script>
 
+  <!-- include source files here... -->
+  <!-- <script src="../js/main.js"></script> -->
 
   <!-- include spec files here... -->
-  <script src="spec/MainSpec.js"></script>
+
+  <script type="text/javascript">
+
+        require(
+            [
+                "domReady!",
+                "spec/MainSpec"
+            ],
+            function( document ){
+
+                // Set up the HTML reporter - this is reponsible for
+                // aggregating the results reported by Jasmine as the
+                // tests and suites are executed.
+                jasmine.getEnv().addReporter(
+                    new jasmine.HtmlReporter()
+                );
+
+                // Run all the loaded test specs.
+                jasmine.getEnv().execute();
+
+            }
+        );
+
+    </script>
+
+  <!-- // <script src="spec/MainSpec.js"></script> -->
 
 </head>
 
diff --git a/test/lib/requirejs-plugins/domReady.js b/test/lib/requirejs-plugins/domReady.js
new file mode 100644
index 0000000..2b54122
--- /dev/null
+++ b/test/lib/requirejs-plugins/domReady.js
@@ -0,0 +1,129 @@
+/**
+ * @license RequireJS domReady 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/requirejs/domReady for details
+ */
+/*jslint */
+/*global require: false, define: false, requirejs: false,
+  window: false, clearInterval: false, document: false,
+  self: false, setInterval: false */
+
+
+define(function () {
+    'use strict';
+
+    var isTop, testDiv, scrollIntervalId,
+        isBrowser = typeof window !== "undefined" && window.document,
+        isPageLoaded = !isBrowser,
+        doc = isBrowser ? document : null,
+        readyCalls = [];
+
+    function runCallbacks(callbacks) {
+        var i;
+        for (i = 0; i < callbacks.length; i += 1) {
+            callbacks[i](doc);
+        }
+    }
+
+    function callReady() {
+        var callbacks = readyCalls;
+
+        if (isPageLoaded) {
+            //Call the DOM ready callbacks
+            if (callbacks.length) {
+                readyCalls = [];
+                runCallbacks(callbacks);
+            }
+        }
+    }
+
+    /**
+     * Sets the page as loaded.
+     */
+    function pageLoaded() {
+        if (!isPageLoaded) {
+            isPageLoaded = true;
+            if (scrollIntervalId) {
+                clearInterval(scrollIntervalId);
+            }
+
+            callReady();
+        }
+    }
+
+    if (isBrowser) {
+        if (document.addEventListener) {
+            //Standards. Hooray! Assumption here that if standards based,
+            //it knows about DOMContentLoaded.
+            document.addEventListener("DOMContentLoaded", pageLoaded, false);
+            window.addEventListener("load", pageLoaded, false);
+        } else if (window.attachEvent) {
+            window.attachEvent("onload", pageLoaded);
+
+            testDiv = document.createElement('div');
+            try {
+                isTop = window.frameElement === null;
+            } catch (e) {}
+
+            //DOMContentLoaded approximation that uses a doScroll, as found by
+            //Diego Perini: http://javascript.nwbox.com/IEContentLoaded/,
+            //but modified by other contributors, including jdalton
+            if (testDiv.doScroll && isTop && window.external) {
+                scrollIntervalId = setInterval(function () {
+                    try {
+                        testDiv.doScroll();
+                        pageLoaded();
+                    } catch (e) {}
+                }, 30);
+            }
+        }
+
+        //Check if document already complete, and if so, just trigger page load
+        //listeners. Latest webkit browsers also use "interactive", and
+        //will fire the onDOMContentLoaded before "interactive" but not after
+        //entering "interactive" or "complete". More details:
+        //http://dev.w3.org/html5/spec/the-end.html#the-end
+        //http://stackoverflow.com/questions/3665561/document-readystate-of-interactive-vs-ondomcontentloaded
+        //Hmm, this is more complicated on further use, see "firing too early"
+        //bug: https://github.com/requirejs/domReady/issues/1
+        //so removing the || document.readyState === "interactive" test.
+        //There is still a window.onload binding that should get fired if
+        //DOMContentLoaded is missed.
+        if (document.readyState === "complete") {
+            pageLoaded();
+        }
+    }
+
+    /** START OF PUBLIC API **/
+
+    /**
+     * Registers a callback for DOM ready. If DOM is already ready, the
+     * callback is called immediately.
+     * @param {Function} callback
+     */
+    function domReady(callback) {
+        if (isPageLoaded) {
+            callback(doc);
+        } else {
+            readyCalls.push(callback);
+        }
+        return domReady;
+    }
+
+    domReady.version = '2.0.1';
+
+    /**
+     * Loader Plugin API method
+     */
+    domReady.load = function (name, req, onLoad, config) {
+        if (config.isBuild) {
+            onLoad(null);
+        } else {
+            domReady(onLoad);
+        }
+    };
+
+    /** END OF PUBLIC API **/
+
+    return domReady;
+});
diff --git a/test/spec/MainSpec.js b/test/spec/MainSpec.js
index 0b37c2a..d6d7dfe 100644
--- a/test/spec/MainSpec.js
+++ b/test/spec/MainSpec.js
@@ -1,5 +1,8 @@
-describe("addVotedProposal", function(){
-  it("Should register a voted id", function(){
-      addVotedProposal(1).toEqual(true);
+define(["model/main"],function(){
+
+  describe("addVotedProposal", function(){
+    it("Should register a voted id", function(){
+        addVotedProposal(1).toEqual(true);
+    });
   });
 });
--
libgit2 0.21.2