diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index eab75fe3e..f03c63b37 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -169,6 +169,8 @@ module.exports = React.createClass({
                     { buttonGroup }
                 </div>
                 { panel }
+                <div className="mx_RightPanel_footer">
+                </div>
             </aside>
         );
     }
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index beec83bf1..69434dc2a 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -25,7 +25,6 @@ module.exports = React.createClass({
 
     render: function() {
         var TintableSvg = sdk.getComponent('elements.TintableSvg');
-        var EditableText = sdk.getComponent("elements.EditableText");
 
         var toggleCollapse;
         if (this.props.collapsed) {
@@ -41,11 +40,9 @@ module.exports = React.createClass({
                     className="mx_SearchBox_searchButton"
                     src="img/search.svg" width="21" height="19"
                 />
-                <EditableText
+                <input
+                    type="text"
                     className="mx_SearchBox_search"
-                    placeholderClassName="mx_SearchBox_searchPlaceholder"
-                    blurToCancel={ false }
-                    editable={ true }
                     placeholder="Search Vector"
                 />
                 { toggleCollapse }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
index 8553e202a..c8772b499 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -207,7 +207,7 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_statusAreaBox {
     max-width: 960px;
     margin: auto;
-    min-height: 49px;
+    min-height: 60px;
 }
 
 .mx_RoomView_statusAreaBox_line {
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css b/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
index 77c8e54fe..8c8c470a3 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
@@ -18,8 +18,8 @@ limitations under the License.
     height: 24px;
     margin-left: 20px;
     margin-right: 20px;
-    padding-top: 23px;
-    padding-bottom: 23px;
+    padding-top: 26px;
+    padding-bottom: 20px;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 
     display: flex;
@@ -33,13 +33,14 @@ limitations under the License.
 .mx_SearchBox_search {
     flex: 1;
     -webkit-flex: 1;
+    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
     font-size: 12px;
     height: 24px;
-    vertical-align: middle;
-}
-
-.mx_SearchBox_searchPlaceholder {
-    opacity: 0.5;
+    margin-top: -4px;
+    border: 0px ! important;
+    /* border-bottom: 1px solid rgba(0, 0, 0, 0.1) ! important; */
+    background-color: transparent;
+    border: 0px;
 }
 
 .mx_SearchBox_minimise,
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
index e6a340df6..30de93242 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 .mx_MemberInfo {
+    margin-top: 20px;
     height: 100%;
 }
 
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
index b631f05d5..88f7fafe9 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
@@ -17,6 +17,8 @@ limitations under the License.
 .mx_MemberList {
     height: 100%;
 
+    margin-top: 12px;
+
     -webkit-flex: 1;
     flex: 1;
 
@@ -77,17 +79,6 @@ limitations under the License.
 }
 */
 
-.mx_MemberList_bottom {
-    order: 4;
-    flex: 0 0 60px;
-    -webkit-flex: 0 0 60px;
-}
-
-.mx_MemberList_bottomRule {
-    border-top: 1px solid #e5e5e5;
-    margin-right: 15px;
-}
-
 .mx_MemberList_invited h2 {
     text-transform: uppercase;
     color: #3d3b39;
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index 56e1fb4b8..f6112da6e 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -33,6 +33,9 @@ limitations under the License.
     -webkit-order: 1;
     order: 1;
 
+    border-bottom: 1px solid #e5e5e5;
+    margin-right: 20px;
+
     -webkit-flex: 0 0 70px;
     flex: 0 0 70px;
 }
@@ -90,3 +93,17 @@ limitations under the License.
     -webkit-order: 2;
     order: 2;
 }
+
+.mx_RightPanel_footer {
+    -webkit-box-ordinal-group: 3;
+    -moz-box-ordinal-group: 3;
+    -ms-flex-order: 3;
+    -webkit-order: 3;
+    order: 3;
+
+    border-top: 1px solid #e5e5e5;
+    margin-right: 20px;
+
+    -webkit-flex: 0 0 60px;
+    flex: 0 0 60px;
+}