diff --git a/static/css/footer.css b/static/css/footer.css
index ebd6fac..689b5d1 100644
--- a/static/css/footer.css
+++ b/static/css/footer.css
@@ -48,6 +48,7 @@
 .footer-gov .institucionais a{
   display:table-cell;
   vertical-align: middle;
+  float: right;
 }
 
 .footer-gov a:hover{
@@ -64,6 +65,10 @@
   padding-bottom: 10px;
 }
 
+.footer-gov .logo-brasil img{
+  padding-right: 0;
+}
+
 .go-top{
   font-size: 13px;
   height: 2em;
diff --git a/static/css/header.css b/static/css/header.css
index a7c6efc..0f77780 100644
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -127,7 +127,6 @@
 #search-form #header-searchbox{
   width: 100%;
   border-radius: 5px 0px 0px 5px;
-  border-right: none;
   background: #fff;
 }
 
diff --git a/static/css/screen.css b/static/css/screen.css
index c70ef55..d7cb08e 100644
--- a/static/css/screen.css
+++ b/static/css/screen.css
@@ -452,8 +452,3 @@ span.highlighted {
 .chart > p > label {
     margin: 0 2px;
 }
-
-.row {
-  margin-left: 0;
-  margin-right: 0;
-}
diff --git a/templates/footer.html b/templates/footer.html
index 9628c6e..c6639cc 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -13,7 +13,7 @@
       <div class="row">
         <dl class="col-md-3 footer-links">
           <dt>{% trans "Topics" %}</dt>
-          <dd><a href="http://www.softwarepublico.gov.br/O_que_e_o_SPB" title="SPB">{% trans "SPB" %}</a></dd>
+          <dd><a href="/social/spb/o-que-e-o-software-publico" title="SPB">{% trans "SPB" %}</a></dd>
           <dd><a href="http://pagina.softwarepublico.gov.br/sisp" title="SISP-SPB">{% trans "SISP-SPB" %}</a></dd>
           <dd><a href="http://www.softwarepublico.gov.br/5cqualibr/avaliaspb/wiki/Sobre" title="AvaliaSPB">{% trans "AvaliaSPB" %}</a></dd>
           <dd><a href="http://www.softwarepublico.gov.br/4cmbr/xowiki/Principal" title="4CMBr">{% trans "4CMBr" %}</a></dd>
@@ -22,19 +22,10 @@
         <dl class="col-md-3 footer-links">
           <dt>{% trans "Services" %}</dt>
             <dd class="portalservicos-item">
-                <a title="Perguntas frequentes" href="#">{% trans "Frequently Asked Questions" %}</a>
+                <a title="Perguntas frequentes" href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
             </dd>
             <dd class="portalservicos-item">
-                <a title="Contato" href="#">{% trans "Contact" %}</a>
-            </dd>
-            <dd class="portalservicos-item">
-                <a title="Serviços da [Denominação]" href="#">{% trans " [Denomination's] services" %}</a>
-            </dd>
-            <dd class="portalservicos-item">
-                <a title="Dados abertos" href="#">{% trans "Open data" %}</a>
-            </dd>
-            <dd class="portalservicos-item">
-                <a title="Área de imprensa" href="#">{% trans "Press area" %}</a>
+                <a title="Contato" href="/social/spb/contato">{% trans "Contact" %}</a>
             </dd>
         </dl>
         <dl class="col-md-3 footer-links">
@@ -45,10 +36,8 @@
         <dl class="col-md-3 footer-links">
           <dt>{% trans "Navigation" %}</dt>
             <dd><a href="#">{% trans "Accessibility" %}</a></dd>
-            <dd><a href="#">{% trans "Site map" %}</a></dd>
-            <dd><a href="#">Versión en Español</a></dd>
+            <dd><a href="/social/spb/mapa-do-site">{% trans "Site map" %}</a></dd>
             <dd><a href="#">Versão em Português</a></dd>
-            <dd><a href="#">English version</a></dd>
         </dl>
       </div>
     </div>
@@ -59,7 +48,8 @@
         <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="{% static 'img/acesso-a-informacao.png' %}" ><span>{% trans "Information access" %}</span></a>
       </div>
       <div class="col-md-5 institucionais">
-        <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>{% trans "Republic Presidency General Secretary" %}<a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>{% trans "Brazil - Federal Government" %}</span></a>
+        <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>{% trans "Brazil - Federal Government" %}</span></a>
+        <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>{% trans "Republic Presidency General Secretary" %}</span></a>
       </div>
     </div>
   </div><!-- end footer-gov -->
diff --git a/templates/header.html b/templates/header.html
index a2ff4f7..f9d5990 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -34,7 +34,7 @@
               <a href="#"><span>{% trans "High contrast" %}</span></a>
             </li>
             <li id="siteaction-mapadosite">
-              <a href="/search"><span>{% trans "Site map" %}</span></a>
+              <a href="/social/spb/mapa-do-site"><span>{% trans "Site map" %}</span></a>
             </li>
             <!-- begin of user-menu -->
             {% if not user.is_authenticated %}
@@ -87,7 +87,7 @@
       <div class="row" id="spb-logo-search">
         <div class="col-md-6 logo-box">
           <div id="logo">
-            <a href="#" id="portal-logo">
+            <a href="/" id="portal-logo">
                   <img class="img-responsive pull-left" src="{% static 'img/logo.svg' %}" />
             </a>
           </div>
@@ -113,10 +113,10 @@
       <div class="row">
         <ul id="quick-links-sm" class="hidden-md hidden-lg">
           <li id="link-faq">
-            <a href="/ajuda/ajuda/duvidas-frequentes">{% trans "Frequently Asked Questions" %}</a>
+            <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
           </li>
           <li id="link-contact">
-            <a href="/contact/portal/new">{% trans "Contact" %}</a>
+            <a href="/social/spb/contato">{% trans "Contact" %}</a>
           </li>
         </ul>
         <div class="navbar-header logo">
@@ -134,10 +134,10 @@
         </ul>
         <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
           <li id="link-faq">
-            <a href="/ajuda/ajuda/duvidas-frequentes">{% trans "Frequently Asked Questions" %}</a>
+            <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
           </li>
           <li id="link-contact">
-            <a href="/contact/portal/new">{% trans "Contact" %}</a>
+            <a href="/social/spb/contato">{% trans "Contact" %}</a>
           </li>
         </ul>
       </div>
--
libgit2 0.21.2