diff --git a/covid19/static/css/covid19-map.css b/covid19/static/css/covid19-map.css
index 2896fbac..8be9484a 100644
--- a/covid19/static/css/covid19-map.css
+++ b/covid19/static/css/covid19-map.css
@@ -63,18 +63,48 @@
 
 #map-col {
   padding: 0 2px 0 0;
+  overflow: auto;
 }
 #table-col {
   padding: 0 0 0 0;
+  overflow: auto;
 }
 
 .state-option {
   font-size: 1em;
-  padding: 0 1em;
+  padding: 0 0.75em;
 }
-@media screen and (max-width: 1280px) {
+
+#dashboard-state-selector nav {
+  height: auto;
+  margin: 30px 0 15px 0;
+}
+#dashboard-state-selector nav ul {
+  overflow: auto;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+}
+
+@media screen and (min-width: 601px) {
+  #dashboard-state-selector nav ul {
+    flex-wrap: wrap;
+  }
+}
+
+@media screen and (min-width: 992px) {
+  .state-option {
+    padding: 0 0.33em;
+  }
+}
+
+@media screen and (min-width: 1200px) {
   .state-option {
-    font-size: 1em;
-    padding: 0 0.25em;
+    padding: 0 0.537em;
   }
 }
+
+div.dataTables_wrapper {
+  min-width: 800px;
+  margin: 0 auto;
+}
\ No newline at end of file
diff --git a/covid19/static/js/covid19-table.js b/covid19/static/js/covid19-table.js
index 07cc0adc..e1a7925a 100644
--- a/covid19/static/js/covid19-table.js
+++ b/covid19/static/js/covid19-table.js
@@ -28,6 +28,7 @@ jQuery(document).ready(function() {
     "autoWidth": false,
     "columns": columns,
     "scrollY":        "650px",
+    "scrollX": true,
     "scrollCollapse": true,
     "paging":         false,
     "searching":      true,
diff --git a/covid19/templates/dashboard.html b/covid19/templates/dashboard.html
index 4ba9e6c8..1b6fb5f6 100644
--- a/covid19/templates/dashboard.html
+++ b/covid19/templates/dashboard.html
@@ -18,22 +18,30 @@
 <div id="dashboard-header">
   <h1> ESPECIAL COVID-19 - Dados por Município </h1>
   {% include 'covid19-text.html' %}
-  <div class="center">
-    <a class="btn"
+  <ul id="dashboard-menu">
+    <li><a class="btn"
       href="https://blog.brasil.io/2020/03/23/dados-coronavirus-por-municipio-mais-atualizados/">
       Sobre o projeto
     </a>
+    </li>
+    <li>
     <a class="btn" href="{% url 'core:dataset-detail' 'covid19' %}">
       Dados completos
     </a>
+    </li>
+    <li>
     <a class="btn" href="https://github.com/turicas/covid19-br/tree/master/api.md">
       Documentação da API
     </a>
+    </li>
+    <li>
     <a class="btn" href="https://github.com/turicas/covid19-br/tree/master/clipping.md">
       Quem está usando
-    </a>
+    </a></li>
+    <li>
     <a class="btn" href="{% url 'core:donate' %}">Apoie o projeto</a>
-  </div>
+    </li>
+  </ul>
 </div>
 
 <div id="dashboard-country-aggregate" class="row card" style="height: 100%">
@@ -58,9 +66,8 @@ <h1> ESPECIAL COVID-19 - Dados por Município </h1>
   <div style="clear: both"></div>
 </div>
 
-<div id="dashboard-state-selector" class="row" style="clear: both">
-  <nav>
-  <div class="nav-wrapper indigo">
+<div id="dashboard-state-selector">
+  <nav class="indigo">
     <ul>
       <li{% if not state %} class="active"{% endif %}>
         <a class="state-option" href="{% url 'covid19:dashboard' %}">BR</a>
@@ -71,7 +78,6 @@ <h1> ESPECIAL COVID-19 - Dados por Município </h1>
       </li>
       {% endfor %}
     </ul>
-  </div>
   </nav>
 </div>
 
diff --git a/static/css/application.css b/static/css/application.css
index 02f5345b..ab2c6c17 100644
--- a/static/css/application.css
+++ b/static/css/application.css
@@ -164,3 +164,30 @@ h1, h2, h3, h4, h5, h6 {
 
 strong { font-weight: bold !important; }
 em { font-style: italic !important; }
+
+
+#dashboard-menu {
+  margin-bottom: 30px;
+  overflow: auto;
+  white-space: nowrap;
+}
+
+#dashboard-menu li {
+  display: inline-block;
+  margin: 0 8px;
+}
+
+#dashboard-menu li:first-child {
+  margin-left: 0;
+}
+
+@media only screen and (min-width: 601px) {
+  #dashboard-menu {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
+  #dashboard-menu li {
+    margin-bottom: 15px;
+  }
+}
\ No newline at end of file