diff --git a/index.html b/index.html
index 33b7659..269158f 100644
--- a/index.html
+++ b/index.html
@@ -133,32 +133,39 @@
           <div class="col-sm-3">
             <aside id="proposal-categories">
               <div id="proposal-categories-container">
+                <h2><strong>Programas</strong> por Tema</h2>
                 <ul class="themes">
                 {{#each article.categories}}
                   <li id="proposal-category-{{slug}}" class="proposal-category" data-category="{{slug}}">
-                    <a href="#/temas/{{slug}}/{{id}}" class="proposal-link " data-target="proposal-item-{{id}}">{{name}}</a>
+                    <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">
+                      <span class="icon icon-theme icon-{{slug}}"></span>
+                      {{name}}
+                    </a>
                     <!-- <div class="arrow-box" style="display: none"></div> -->
                   </li>
                 {{/each}}
                 </ul>
-                {{#each article.categories}}
-                  <section id="proposal-item-{{id}}" class="proposal-category-items proposal-category-items-{{slug}} hide proposal-container clearfix {{slug}}" data-category="{{slug}}">
-                    <div class="header">
-                      <div class="name">{{name}}</div>
-                      <div class="description"></div>
-                    </div>
-                    <ul class="proposal-list">
-                      {{#list_proposal ../article.children category=slug}}
-                        {{#link title id}}{{/link}}
-                      {{/list_proposal}}
-                    </ul>
-                  </section>
-                {{/each}}
               </div>
             </aside>
           </div>
 
           <div class="col-sm-9">
+          {{#each article.categories}}
+            <section id="proposal-item-{{id}}" class="proposal-category-items proposal-category-items-{{slug}} hide proposal-container clearfix {{slug}}" data-category="{{slug}}">
+              <div class="header">
+                <div class="name">{{name}}</div>
+                <div class="description"></div>
+              </div>
+              <ul class="proposal-list row">
+                {{#list_proposal ../article.children category=slug}}
+                  {{#link title id}}{{/link}}
+                {{/list_proposal}}
+              </ul>
+            </section>
+          {{/each}}
+          </div>
+
+          <div class="col-sm-9">
             <article id="proposal-group" class="">
               <!--
               <label for="search-input">Selecione um programa para fazer propostas e contar sua experiência.</label>
@@ -166,7 +173,9 @@
                 <input placeholder="palavra chave" id="search-input" type="text" name="search" />
               </div>
               -->
-              <ul class="proposal-list">
+              <h2>Programas</h2>
+
+              <ul class="proposal-list row">
                 {{#list_proposal article.children}}
                   {{#link title id}}{{/link}}
                 {{/list_proposal}}
@@ -176,8 +185,9 @@
 
           {{#each article.children}}
             {{!-- <div class="container"> --}}
-              <article class="proposal-detail hide" id="proposal-item-{{id}}">
+              <article class="proposal-detail hide col-sm-9" id="proposal-item-{{id}}">
                 <div class="categories {{#each categories}}{{slug}}{{/each}}">
+                  <!--
                   <ul class="select">
                     {{#each categories}}
                       <li class="category proposal-category" data-category="{{slug}}">
@@ -190,6 +200,7 @@
                       </li>
                     {{/each}}
                   </ul>
+                  -->
 
                   <div class="proposal-header">
                     <div class="abstract">
@@ -446,7 +457,7 @@
       </ul>
     </script>
 
-    <script type='text/javascript'	>
+    <script type='text/javascript'  >
       loadRequireJS();
     </script>
 
diff --git a/js/handlebars-helpers.js b/js/handlebars-helpers.js
index f97ed67..b86ffad 100644
--- a/js/handlebars-helpers.js
+++ b/js/handlebars-helpers.js
@@ -19,11 +19,10 @@ define(['handlebars'], function(Handlebars){
     for(var i=0, j=proposals.length; i<j; i++) {
       var proposal = proposals[i];
       
-      element = '<li class="proposal-item">' + 
+      element = '<li class="proposal-item col-sm-6">' + 
         '<a href="#/programas/'+proposal.id+'" data-target="proposal-item-'+proposal.id+'" class="proposal-link box">' +
-          '<div class="box-header item">' +
-            '' + proposal.title;
-      category = "<ul class='category box-category'>";
+          '<div class="box-header item">';
+      category = "<div class='category box-category'>";
       
       
       for(var x=0, y=proposal.categories.length; x<y; x++) {
@@ -31,14 +30,13 @@ define(['handlebars'], function(Handlebars){
           element = '';
           continue;
         }      
-        category = category + '<li class="category-'+proposal.categories[x].slug+' button button-inline">' + proposal.categories[x].name + '</li>';
+        category = category + '<div class="category-'+proposal.categories[x].slug+'">' + proposal.categories[x].name + '</div>';
       }
       if(element == ''){
         continue;
       }
-      category =  category + '</ul>';
+      category =  category + '</div>' + '<div class="box-body">' + '' + proposal.title + (proposal.abstract ? proposal.abstract : '') + '</div>';
       // element = element + options.fn(proposal);
-      element = element + (proposal.abstract ? proposal.abstract : '');
   
       element = element + category;
       ret = ret + element + '</div></a></li>';
diff --git a/js/main.js b/js/main.js
index 9152be1..c60a384 100644
--- a/js/main.js
+++ b/js/main.js
@@ -224,19 +224,19 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
         },
         display_category_tab: function(){
-          // $('#proposal-group').hide();
+          $('#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-category .arrow-box').hide();
           $('.proposal-detail').hide();
 
           $('#content').show();
           $('nav').show();
         },
         display_proposals_tab: function(){
-          // $('#proposal-categories').hide();
+          $('#proposal-categories').hide();
           $('#proposal-group').show();
           $('#nav-proposal-group a').addClass('active');
           $('#nav-proposal-categories a').removeClass('active');
@@ -244,7 +244,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           $('nav').show();
         },
         display_proposal: function(proposal_id){
-          $('#proposal-categories').hide();
+          // $('#proposal-categories').hide();
           $('#proposal-group').hide();
           $('nav').hide();
           $('#content').hide();
@@ -278,7 +278,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
             case 'categories reducao-da-pobreza':
               active_category = 'reducao-da-pobreza';
               break;
-          }        
+          }     
 
           $proposal.find('.calendar.' + active_category).show();
           $proposal.find('.calendar').slick();
@@ -329,9 +329,9 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
                 $('html, body').animate({ scrollTop: itemOffset.top }, 'fast');
               }
             } );
-            // $('.proposal-category .arrow-box').hide();
+            $('.proposal-category .arrow-box').hide();
             var categorySlug = $item.data('category');
-            // $('#proposal-category-' + categorySlug).find('.arrow-box').show();
+            $('#proposal-category-' + categorySlug).find('.arrow-box').show();
 
           }
         },
--
libgit2 0.21.2