diff --git a/dev/scss/main/buttongroup.scss b/dev/scss/main/buttongroup.scss
index acd3094..2f4d750 100644
--- a/dev/scss/main/buttongroup.scss
+++ b/dev/scss/main/buttongroup.scss
@@ -14,36 +14,69 @@
       }
     }
   }
-}
 
-.button-group:not(.view) > span {
-  box-shadow: $choose-box-shadow;
-  font-size: 9pt;
-  line-height: 1.5em;
-  padding: 0 4px;
-  display: inline-block;
-  @include choose-item;
-  border-style: solid;
-  border-width: $border-size 0;
-  &:hover {
-	  @include choose-hover;
+  &.button-panel {
+    > span {
+      box-shadow: $choose-box-shadow;
+      font-size: 9pt;
+      line-height: 1.5em;
+      padding: 0 4px;
+      display: inline-block;
+      @include choose-item;
+      border-style: solid;
+      border-width: $border-size 0;
+      &:hover {
+	      @include choose-hover;
+      }
+      &:first-child {
+	      border: {
+	      left-width: $border-size;
+	      top-left-radius: $standard-border-radius;
+	      bottom-left-radius: $standard-border-radius;
+	    }
+      }
+      &:last-child {
+	      border: {
+	      right-width: $border-size;
+	      top-right-radius: $standard-border-radius;
+	      bottom-right-radius: $standard-border-radius;
+      }
+      }
+    }
   }
-  &:first-child {
-	  border: {
-	    left-width: $border-size;
-	    top-left-radius: $standard-border-radius;
-	    bottom-left-radius: $standard-border-radius;
-	  }
-  }
-  &:last-child {
-	  border: {
-	    right-width: $border-size;
-	    top-right-radius: $standard-border-radius;
-	    bottom-right-radius: $standard-border-radius;
+  &.button-view {
+    display: block;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 20;
+    margin: 0;
+    padding: 0;
+    width: $right-match-distance;
+    > span:first-child {
+      margin-top: $border-size
+    }
+    > span {
+      display: block;
+      border-width: 0;
+      text-decoration:none;
+      text-align: center;
+      font-style: normal;
+      
+      &.download::after {
+	      font-family: 'FontAwesome';
+	      content: $fa-download;
+      }
+      
+      &.close::after {
+	      font-family: 'FontAwesome';
+	      content: $fa-close;
+      }
     }
   }
 }
- 
+
+
 ul.button-group-list {
   border-top-right-radius: 8px;
   z-index: 150;
@@ -59,29 +92,3 @@
 }
 
 
-.button-group.view {
-  display: block;
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: 20;
-  margin: 0;
-  padding: 0;
-  width: $right-match-distance;
-  > span {
-    border-width: 0;
-    text-decoration:none;
-    text-align: center;
-    font-style: normal;
-    
-    &.download::after {
-	    font-family: 'FontAwesome';
-	    content: $fa-download;
-    }
-    
-    &.close::after {
-	    font-family: 'FontAwesome';
-	    content: $fa-close;
-    }
-  }
-}
diff --git a/dev/scss/main/koralquery.scss b/dev/scss/main/koralquery.scss
index 1aec746..6a9550d 100644
--- a/dev/scss/main/koralquery.scss
+++ b/dev/scss/main/koralquery.scss
@@ -4,9 +4,7 @@
 $border-size: 2px;
 
 #koralquery {
-  border: 1px solid $kwic-border;
   white-space: pre;
-  background-color: $dark-orange;
   > div {
     overflow-x: auto;
     font-size: 85%;
diff --git a/dev/scss/main/matchinfo.scss b/dev/scss/main/matchinfo.scss
index 334ac74..212fad0 100644
--- a/dev/scss/main/matchinfo.scss
+++ b/dev/scss/main/matchinfo.scss
@@ -30,6 +30,8 @@
   display: none !important;
 }
 
+// TODO:
+//   This is now a view
 div.matchinfo {
   position: relative;
   width: 100%;
diff --git a/dev/scss/main/panel.scss b/dev/scss/main/panel.scss
index 25d541b..960066d 100644
--- a/dev/scss/main/panel.scss
+++ b/dev/scss/main/panel.scss
@@ -5,22 +5,31 @@
   position: relative;
   width: 100%;
   display: block;
-  padding-top: $border-size;
-  background-color: $dark-orange;
-  border: {
-    style: solid;
-    color: $dark-orange;
-    width: 0;
+  > div {
+    /*
+    border: {
+      style: solid;
+      width: $border-size;
+    }
+    &:empty {
+      border-width: 0;
+    }
+   */
   }
 }
 
 div.view {
   position: relative;
+  padding-top: $border-size;
   display: block;
-  min-height: 40px;
-  background-color: $middle-green;
   width: 100%;
   .button-group {
     color: white;
   }
 }
+
+
+#search div.view {
+  border: 1px solid $kwic-border;
+  background-color: $dark-orange;
+}
\ No newline at end of file
diff --git a/dev/scss/main/resultinfo.scss b/dev/scss/main/resultinfo.scss
index 0ad4fc1..f53de78 100644
--- a/dev/scss/main/resultinfo.scss
+++ b/dev/scss/main/resultinfo.scss
@@ -1,7 +1,6 @@
 @charset "utf-8";
 @import "../util";
 
-$border-size : 1px;
 
 #resultinfo {
   clear: both;
@@ -19,7 +18,8 @@
 }
 
 // Specify result button group layout
-.result.button-group {
+.result.button-group.button-panel {
+  width: auto;
   vertical-align: bottom;
   display: inline-block;
   line-height: 1.3em;