diff --git a/css/multiview.css b/css/multiview.css
index ccdb52e6..021033cb 100644
--- a/css/multiview.css
+++ b/css/multiview.css
@@ -1,6 +1,9 @@
 .recline-data-explorer .data-view-container {
   display: block;
-  clear: both;
+}
+
+.recline-data-explorer .data-view-sidebar {
+  float: right;
 }
 
 .recline-data-explorer .header .navigation,
diff --git a/src/view.multiview.js b/src/view.multiview.js
index 4b8417c3..dd90d641 100644
--- a/src/view.multiview.js
+++ b/src/view.multiview.js
@@ -88,12 +88,13 @@ my.MultiView = Backbone.View.extend({
       <div class="menu-right"> \
         <div class="btn-group" data-toggle="buttons-checkbox"> \
           <a href="#" class="btn" data-action="filters">Filters</a> \
-          <a href="#" class="btn" data-action="fields">Fields</a> \
+          <a href="#" class="btn active" data-action="fields">Fields</a> \
         </div> \
       </div> \
       <div class="query-editor-here" style="display:inline;"></div> \
       <div class="clearfix"></div> \
     </div> \
+    <div class="data-view-sidebar"></div> \
     <div class="data-view-container"></div> \
   </div> \
   ',
@@ -220,7 +221,7 @@ my.MultiView = Backbone.View.extend({
       model: this.model
     });
     this.$fieldsView = fieldsView.el;
-    this.el.find('.header').append(fieldsView.el);
+    this.el.find('.data-view-sidebar').append(fieldsView.el);
   },
 
   updateNav: function(pageName) {
diff --git a/src/widget.fields.js b/src/widget.fields.js
index 91ff4d16..7d86cc09 100644
--- a/src/widget.fields.js
+++ b/src/widget.fields.js
@@ -85,7 +85,7 @@ my.Fields = Backbone.View.extend({
     });
     var templated = Mustache.render(this.template, tmplData);
     this.el.html(templated);
-    this.el.find('.collapse').collapse();
+    this.el.find('.collapse').collapse('hide');
   }
 });