diff --git a/TODO.md b/TODO.md
index d65f4972602cc..302271b453d24 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,6 @@
 List of TODO items for Panoramix
 
 ## Improvments
-* Reintroduce query and stopwatch
 * [druid] Allow for post aggregations (ratios!)
 * [sql] find a way to manage time granularity
 * [sql] support arbitrary expression as column
@@ -11,6 +10,12 @@ List of TODO items for Panoramix
 * csv export out of table view
 * in/notin filters autocomplete
 
+## Better Javascript enables
+* Async on Druidify! in exploration page
+* Async form reload onchange of viz_type dropdown
+* Reintroduce query and stopwatch
+* Fix resize / refresh
+
 ## New Features
 * Annotations layers
 * Add a per-datasource permission
diff --git a/panoramix/static/loading.gif b/panoramix/static/img/loading.gif
similarity index 100%
rename from panoramix/static/loading.gif
rename to panoramix/static/img/loading.gif
diff --git a/panoramix/static/d3.layout.cloud.js b/panoramix/static/lib/d3.layout.cloud.js
similarity index 100%
rename from panoramix/static/d3.layout.cloud.js
rename to panoramix/static/lib/d3.layout.cloud.js
diff --git a/panoramix/static/d3.min.js b/panoramix/static/lib/d3.min.js
similarity index 100%
rename from panoramix/static/d3.min.js
rename to panoramix/static/lib/d3.min.js
diff --git a/panoramix/static/dataTables.bootstrap.css b/panoramix/static/lib/dataTables/dataTables.bootstrap.css
similarity index 100%
rename from panoramix/static/dataTables.bootstrap.css
rename to panoramix/static/lib/dataTables/dataTables.bootstrap.css
diff --git a/panoramix/static/dataTables.bootstrap.js b/panoramix/static/lib/dataTables/dataTables.bootstrap.js
similarity index 100%
rename from panoramix/static/dataTables.bootstrap.js
rename to panoramix/static/lib/dataTables/dataTables.bootstrap.js
diff --git a/panoramix/static/jquery.dataTables.min.css b/panoramix/static/lib/dataTables/jquery.dataTables.min.css
similarity index 100%
rename from panoramix/static/jquery.dataTables.min.css
rename to panoramix/static/lib/dataTables/jquery.dataTables.min.css
diff --git a/panoramix/static/jquery.dataTables.min.js b/panoramix/static/lib/dataTables/jquery.dataTables.min.js
similarity index 100%
rename from panoramix/static/jquery.dataTables.min.js
rename to panoramix/static/lib/dataTables/jquery.dataTables.min.js
diff --git a/panoramix/static/jquery.gridster.min.css b/panoramix/static/lib/gridster/jquery.gridster.min.css
similarity index 100%
rename from panoramix/static/jquery.gridster.min.css
rename to panoramix/static/lib/gridster/jquery.gridster.min.css
diff --git a/panoramix/static/jquery.gridster.with-extras.min.js b/panoramix/static/lib/gridster/jquery.gridster.with-extras.min.js
similarity index 100%
rename from panoramix/static/jquery.gridster.with-extras.min.js
rename to panoramix/static/lib/gridster/jquery.gridster.with-extras.min.js
diff --git a/panoramix/static/nv.d3.css b/panoramix/static/lib/nvd3/nv.d3.css
similarity index 100%
rename from panoramix/static/nv.d3.css
rename to panoramix/static/lib/nvd3/nv.d3.css
diff --git a/panoramix/static/nv.d3.min.js b/panoramix/static/lib/nvd3/nv.d3.min.js
similarity index 100%
rename from panoramix/static/nv.d3.min.js
rename to panoramix/static/lib/nvd3/nv.d3.min.js
diff --git a/panoramix/static/select2-bootstrap.css b/panoramix/static/lib/select2/select2-bootstrap.css
similarity index 100%
rename from panoramix/static/select2-bootstrap.css
rename to panoramix/static/lib/select2/select2-bootstrap.css
diff --git a/panoramix/static/select2.min.css b/panoramix/static/lib/select2/select2.min.css
similarity index 100%
rename from panoramix/static/select2.min.css
rename to panoramix/static/lib/select2/select2.min.css
diff --git a/panoramix/static/select2.min.js b/panoramix/static/lib/select2/select2.min.js
similarity index 100%
rename from panoramix/static/select2.min.js
rename to panoramix/static/lib/select2/select2.min.js
diff --git a/panoramix/templates/panoramix/dashboard.html b/panoramix/templates/panoramix/dashboard.html
index d4180297bfcfd..232816632645e 100644
--- a/panoramix/templates/panoramix/dashboard.html
+++ b/panoramix/templates/panoramix/dashboard.html
@@ -5,7 +5,7 @@
     {% for css in dashboard.css_files %}
         <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename=css) }}">
     {% endfor %}
-    <link rel="stylesheet" href="{{ url_for('static', filename="jquery.gridster.min.css") }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename="lib/gridster/jquery.gridster.min.css") }}">
     {% for slice in dashboard.slices %}
       {% set viz = slice.viz %}
       {% import viz.template as viz_macros %}
@@ -16,9 +16,7 @@
 {% block content_fluid %}
 <div class="dashboard">
 <div class="title">
-  <div class="row">
-    <div class="col-md-1 text-left"></div>
-    <div class="col-md-10 text-middle">
+    <div class="text-middle">
       <h2>
         {{ dashboard.dashboard_title }}
         <div class="btn-group pull-right" role="group" >
@@ -31,9 +29,6 @@ <h2>
         </div>
       </h2>
     </div>
-    <div class="col-md-1 text-right">
-    </div>
-  </div>
 </div>
 <div class="gridster content_fluid">
     <ul>
@@ -83,7 +78,7 @@ <h2>
     {% for js in dashboard.js_files %}
         <script src="{{ url_for('static', filename=js) }}"></script>
     {% endfor %}
-    <script src="/static/jquery.gridster.with-extras.min.js"></script>
+    <script src="/static/lib/gridster/jquery.gridster.with-extras.min.js"></script>
     <script>
       $(document).ready(initializeDashboardView);
     </script>
diff --git a/panoramix/templates/panoramix/viz_bignumber.html b/panoramix/templates/panoramix/viz_bignumber.html
index 3a5610df6be41..19becaffc335c 100644
--- a/panoramix/templates/panoramix/viz_bignumber.html
+++ b/panoramix/templates/panoramix/viz_bignumber.html
@@ -1,6 +1,6 @@
 {% macro viz_html(viz) %}
 <div id="{{ viz.token }}" class="viz_bignumber" style="height: 100%;">
-  <img src="{{ url_for("static", filename="loading.gif") }}" class="loading">
+  <img src="{{ url_for("static", filename="img/loading.gif") }}" class="loading">
 </div>
 {% endmacro %}
 
diff --git a/panoramix/templates/panoramix/viz_nvd3.html b/panoramix/templates/panoramix/viz_nvd3.html
index 4e5ef848f7fae..b86231218cb56 100644
--- a/panoramix/templates/panoramix/viz_nvd3.html
+++ b/panoramix/templates/panoramix/viz_nvd3.html
@@ -1,6 +1,6 @@
 {% macro viz_html(viz) %}
 <div id="{{ viz.token }}" style="height:100%; width: 100%">
-  <img src="{{ url_for("static", filename="loading.gif") }}" class="loading">
+  <img src="{{ url_for("static", filename="img/loading.gif") }}" class="loading">
   <div class="chart with-3d-shadow with-transitions" style="height:100%; width: 100%"></div>
 </div>
 {% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_table.html b/panoramix/templates/panoramix/viz_table.html
index bb1c8795b14a5..49cfbcb5dd057 100644
--- a/panoramix/templates/panoramix/viz_table.html
+++ b/panoramix/templates/panoramix/viz_table.html
@@ -27,7 +27,7 @@
     </table>
   {% else %}
   <div id="{{ viz.token }}" style="display: none;overflow: auto; height: 100%;"></div>
-  <img src="{{ url_for("static", filename="loading.gif") }}" class="loading">
+  <img src="{{ url_for("static", filename="img/loading.gif") }}" class="loading">
   {% endif %}
 {% endmacro %}
 
diff --git a/panoramix/templates/panoramix/viz_word_cloud.html b/panoramix/templates/panoramix/viz_word_cloud.html
index 3260da7e4a81d..f833ba97fb6ee 100644
--- a/panoramix/templates/panoramix/viz_word_cloud.html
+++ b/panoramix/templates/panoramix/viz_word_cloud.html
@@ -1,6 +1,6 @@
 {% macro viz_html(viz) %}
 <div id="{{ viz.token }}" style="height: 100%;">
-  <img src="{{ url_for("static", filename="loading.gif") }}" class="loading">
+  <img src="{{ url_for("static", filename="img/loading.gif") }}" class="loading">
 </div>
 {% endmacro %}
 
diff --git a/panoramix/viz.py b/panoramix/viz.py
index b2d2d351df2ff..b69c4111212c7 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -185,8 +185,10 @@ class TableViz(BaseViz):
     verbose_name = "Table View"
     template = 'panoramix/viz_table.html'
     form_fields = BaseViz.form_fields + ['row_limit']
-    css_files = ['dataTables.bootstrap.css']
-    js_files = ['jquery.dataTables.min.js', 'dataTables.bootstrap.js']
+    css_files = ['lib/dataTables/dataTables.bootstrap.css']
+    js_files = [
+        'lib/dataTables/jquery.dataTables.min.js',
+        'lib/dataTables/dataTables.bootstrap.js']
 
     def query_obj(self):
         d = super(TableViz, self).query_obj()
@@ -236,8 +238,8 @@ class WordCloudViz(BaseViz):
         'rotation',
     ]
     js_files = [
-        'd3.min.js',
-        'd3.layout.cloud.js',
+        'lib/d3.min.js',
+        'lib/d3.layout.cloud.js',
         'widgets/viz_wordcloud.js',
     ]
 
@@ -262,12 +264,12 @@ class NVD3Viz(BaseViz):
     verbose_name = "Base NVD3 Viz"
     template = 'panoramix/viz_nvd3.html'
     js_files = [
-        'd3.min.js',
-        'nv.d3.min.js',
+        'lib/d3.min.js',
+        'lib/nvd3/nv.d3.min.js',
         'widgets/viz_nvd3.js',
     ]
     css_files = [
-        'nv.d3.css',
+        'lib/nvd3/nv.d3.css',
         'widgets/viz_nvd3.css',
     ]
 
@@ -340,7 +342,7 @@ class BigNumberViz(BaseViz):
     verbose_name = "Big Number"
     template = 'panoramix/viz_bignumber.html'
     js_files = [
-        'd3.min.js',
+        'lib/d3.min.js',
         'widgets/viz_bignumber.js',
     ]
     css_files = [