diff --git a/README.md b/README.md
index 29bcd8eb24534..6c076fd8b9439 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ fabmanager create-admin
 
 # Start the web server
 python run.py
+
 ```
 
 After installation, you should be able to point your browser to the right
@@ -80,3 +81,13 @@ the credential you entered while creating the admin account, and navigate to
 `Menu -> Admin -> Refresh Metadata`. This action should bring in all of 
 your datasources for Panoramix to be aware of, and they should show up in
 `Menu -> Datasources`, from where you can start playing with your data!
+
+Configuration
+-------------
+* From the UI, enter the information about your clusters in the 
+``Admin->Clusters`` menu by hitting the + sign. 
+
+* Once the Druid cluster connection information is entered, hit the 
+``Admin->Refresh Metadata`` menu item to populate
+
+* Navigate to your datasources
diff --git a/TODO.md b/TODO.md
index c8c17f05eb763..b85494863a334 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,7 +6,3 @@
 * Add verbose_name and label method to metrics and columns
 * csv 
 * Save / bookmark / url shortener
-* on save, process metadata / generate metrics
-
-* multi cluster
-
diff --git a/app/templates/panoramix/viz_highcharts.html b/app/templates/panoramix/viz_highcharts.html
index efb4d19276a79..50f39273768d8 100644
--- a/app/templates/panoramix/viz_highcharts.html
+++ b/app/templates/panoramix/viz_highcharts.html
@@ -7,7 +7,7 @@
   {% if form.compare %}
     <div>{{ form.compare.label }}: {{ form.compare(class_="form-control") }}</div>
   {% endif %}
-  {% if form.compare %}
+  {% if form.rolling_type %}
     <div class="row">
       <span  class="col col-sm-5">{{ form.rolling_type.label }}: {{ form.rolling_type(class_="form-control select2") }}</span>
       <span class="col col-sm-4">{{ form.rolling_periods.label }}: {{ form.rolling_periods(class_="form-control") }}</span>
diff --git a/app/viz.py b/app/viz.py
index 8dac33c97b7e7..02212639565fb 100644
--- a/app/viz.py
+++ b/app/viz.py
@@ -254,7 +254,7 @@ def render(self):
     def form_class(self):
         return form_factory(self.datasource, request.args,
             extra_fields_dict={
-                'compare': TextField('Period Compare',),
+                #'compare': TextField('Period Compare',),
                 'rolling_type': SelectField(
                     'Rolling',
                     choices=[(s, s) for s in ['mean', 'sum', 'std']]),