diff --git a/panoramix/templates/panoramix/datasource.html b/panoramix/templates/panoramix/datasource.html
index 37ad684e7..c88eb9d0b 100644
--- a/panoramix/templates/panoramix/datasource.html
+++ b/panoramix/templates/panoramix/datasource.html
@@ -2,6 +2,8 @@
 {% block head_css %}
 {{super()}}
 <style>
+  #form_container {
+  }
   .select2-container-multi .select2-choices {
     height: 70px; 
     overflow: auto;
@@ -41,110 +43,111 @@
 {% set datasource = viz.datasource %}
 {% set form = viz.form %}
 <div class="container-fluid">
-  <div class="col-md-3">
-    <h3>
-      {{ datasource.name }}
-      {% if datasource.description %}
-      <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{ datasource.description }}"></i>
-      {% endif %}
-      <a href="/{{ datasource.baselink }}/edit/{{ datasource.id }}">
-        <i class="fa fa-edit"></i>
-      </a>
-    </h3>
+  <div class="row">
+    <div id="form_container" class="col-md-3">
+      <h3>
+        {{ datasource.name }}
+        {% if datasource.description %}
+        <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{ datasource.description }}"></i>
+        {% endif %}
+        <a href="/{{ datasource.baselink }}/edit/{{ datasource.id }}">
+          <i class="fa fa-edit"></i>
+        </a>
+      </h3>
 
-    <hr>
-    <form id="query" method="GET" style="display: none;">
-      {% for fieldname in form.field_order %}
-      {% if not fieldname.__iter__ %}
-      <div>
-        {% set field = form.get_field(fieldname)%}
+      <hr>
+      <form id="query" method="GET" style="display: none;">
+        {% for fieldname in form.field_order %}
+        {% if not fieldname.__iter__ %}
         <div>
-          {{ field.label }}
-          {% if field.description %}
-          <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="right"
-            title="{{ field.description }}"></i>
-          {% endif %}: 
-          {{ field(class_=form.field_css_classes(field.name)) }}
-        </div>
-      </div>
-      {% else %}
-      <div class="row">
-        <div class="form-group">
-          {% for name in fieldname %}
-          <div class="col-xs-{{ (12 / fieldname|length) | int }}">
-            {% if name %}
-              {% set field = form.get_field(name)%}
-              {{ field.label }}
-              {% if field.description %}
-              <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="right"
-                title="{{ field.description }}"></i>
-              {% endif %}: 
-              {{ field(class_=form.field_css_classes(field.name)) }}
-            {% endif %}
+          {% set field = form.get_field(fieldname)%}
+          <div>
+            {{ field.label }}
+            {% if field.description %}
+            <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="right"
+              title="{{ field.description }}"></i>
+            {% endif %}: 
+            {{ field(class_=form.field_css_classes(field.name)) }}
           </div>
-          {% endfor %}
         </div>
-      </div>
-      {% endif %}
-      {% endfor %}
-      <hr>
-      <h4>Filters</h4>
-      <div id="flt0" style="display: none;">
-        <span class="">{{ form.flt_col_0(class_="form-control inc") }}</span>
+        {% else %}
         <div class="row">
-          <span class="col col-sm-4">{{ form.flt_op_0(class_="form-control inc") }}</span>
-          <span class="col col-sm-6">{{ form.flt_eq_0(class_="form-control inc") }}</span>
-          <button type="button" class="btn btn-sm remove" aria-label="Delete filter">
-            <span class="glyphicon glyphicon-minus"  aria-hidden="true"></span>
-          </button>
+          <div class="form-group">
+            {% for name in fieldname %}
+            <div class="col-xs-{{ (12 / fieldname|length) | int }}">
+              {% if name %}
+                {% set field = form.get_field(name)%}
+                {{ field.label }}
+                {% if field.description %}
+                <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="right"
+                  title="{{ field.description }}"></i>
+                {% endif %}: 
+                {{ field(class_=form.field_css_classes(field.name)) }}
+              {% endif %}
+            </div>
+            {% endfor %}
+          </div>
         </div>
-        <hr style="margin: 5px 0px;"/>
-      </div>
-      <div id="filters"></div>
-      <button type="button" id="plus" class="btn btn-sm" aria-label="Add a filter">
-        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-      </button>
-      <hr>
-      <button type="button" class="btn btn-primary" id="druidify">
-        <i class="fa fa-bolt"></i>
-        Druidify!
-      </button>
-      <button type="button" class="btn btn-default" id="save">
-        <i class="fa fa-save"></i>
-        Save as Slice
-      </button>
-      <hr style="margin-bottom: 0px;">
-      <img src="{{ url_for("static", filename="tux_panoramix.png") }}" width=250>
-      <input type="hidden" id="slice_name" name="slice_name" value="TEST">
-      <input type="hidden" id="action" name="action" value="">
-      <input type="hidden" name="datasource_name" value="{{ datasource.name }}">
-      <input type="hidden" name="datasource_id" value="{{ datasource.id }}">
-      <input type="hidden" name="datasource_type" value="{{ datasource.type }}">
-    </form><br>
-  </div>
-
-  <div class="col-md-9">
-    <h3>{{ viz.verbose_name }}
-      {% if False %}
-      <span class="label label-success">
-        {{ "{0:0.4f}".format(results.duration.total_seconds()) }} s
-      </span>
-      <span class="label label-info btn" 
-        data-toggle="modal" data-target="#query_modal">query</span>
-      {% endif %}
-    </h3>
-    <hr/>
-    <div class="viz" style="height: 700px;">
-      {% block viz_html %}
-      {% if viz.error_msg %}
-      <div class="alert alert-danger">{{ viz.error_msg }}</div>
-      {% endif %}
-      {% if viz.warning_msg %}
-      <div class="alert alert-warning">{{ viz.warning_msg }}</div>
-      {% endif %}
-      {% endblock %}
+        {% endif %}
+        {% endfor %}
+        <hr>
+        <h4>Filters</h4>
+        <div id="flt0" style="display: none;">
+          <span class="">{{ form.flt_col_0(class_="form-control inc") }}</span>
+          <div class="row">
+            <span class="col col-sm-4">{{ form.flt_op_0(class_="form-control inc") }}</span>
+            <span class="col col-sm-6">{{ form.flt_eq_0(class_="form-control inc") }}</span>
+            <button type="button" class="btn btn-sm remove" aria-label="Delete filter">
+              <span class="glyphicon glyphicon-minus"  aria-hidden="true"></span>
+            </button>
+          </div>
+          <hr style="margin: 5px 0px;"/>
+        </div>
+        <div id="filters"></div>
+        <button type="button" id="plus" class="btn btn-sm" aria-label="Add a filter">
+          <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+        </button>
+        <hr>
+        <button type="button" class="btn btn-primary" id="druidify">
+          <i class="fa fa-bolt"></i>
+          Druidify!
+        </button>
+        <button type="button" class="btn btn-default" id="save">
+          <i class="fa fa-save"></i>
+          Save as Slice
+        </button>
+        <hr style="margin-bottom: 0px;">
+        <img src="{{ url_for("static", filename="tux_panoramix.png") }}" width=250>
+        <input type="hidden" id="slice_name" name="slice_name" value="TEST">
+        <input type="hidden" id="action" name="action" value="">
+        <input type="hidden" name="datasource_name" value="{{ datasource.name }}">
+        <input type="hidden" name="datasource_id" value="{{ datasource.id }}">
+        <input type="hidden" name="datasource_type" value="{{ datasource.type }}">
+      </form><br>
     </div>
 
+    <div class="col-md-9">
+      <h3>{{ viz.verbose_name }}
+        {% if False %}
+        <span class="label label-success">
+          {{ "{0:0.4f}".format(results.duration.total_seconds()) }} s
+        </span>
+        <span class="label label-info btn" 
+          data-toggle="modal" data-target="#query_modal">query</span>
+        {% endif %}
+      </h3>
+      <hr/>
+      <div class="viz" style="height: 700px;">
+        {% block viz_html %}
+        {% if viz.error_msg %}
+        <div class="alert alert-danger">{{ viz.error_msg }}</div>
+        {% endif %}
+        {% if viz.warning_msg %}
+        <div class="alert alert-warning">{{ viz.warning_msg }}</div>
+        {% endif %}
+        {% endblock %}
+      </div>
+    </div>
   </div>
 </div>
 <div class="modal fade" id="query_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
diff --git a/panoramix/templates/panoramix/viz_nvd3.html b/panoramix/templates/panoramix/viz_nvd3.html
index 6c62ed1e7..478122028 100644
--- a/panoramix/templates/panoramix/viz_nvd3.html
+++ b/panoramix/templates/panoramix/viz_nvd3.html
@@ -36,7 +36,7 @@
       $.getJSON(url, function(data){
         nv.addGraph(function() {
           // chart_type is {{ viz.chart_type }}
-          {% if viz.chart_type == 'nvd3_line' %}
+          {% if viz.chart_type == 'line' %}
             {% if viz.args.show_brush == 'y' %}
               var chart = nv.models.lineWithFocusChart()
               var xext = chart.xAxis.scale().domain();
diff --git a/panoramix/viz.py b/panoramix/viz.py
index a903590ec..fa9b40b12 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -74,6 +74,7 @@ class BaseViz(object):
 
     @property
     def form(self):
+        return self.form_class(**self.args)
         return self.form_class(self.form_data)
 
     @property
@@ -314,7 +315,7 @@ class BigNumberViz(BaseViz):
 
 class NVD3TimeSeriesViz(NVD3Viz):
     verbose_name = "Time Series - Line Chart"
-    chart_type = "nvd3_line"
+    chart_type = "line"
     sort_series = False
     form_fields = [
         'viz_type',