diff --git a/examples/custom/CustomMTextTile.js b/examples/custom/CustomMTextTile.js
index 716c200126..e58ed4c1e6 100644
--- a/examples/custom/CustomMTextTile.js
+++ b/examples/custom/CustomMTextTile.js
@@ -27,7 +27,7 @@ module.exports = React.createClass({
     render: function() {
         var content = this.props.mxEvent.getContent();
         return (
-            <span ref="content" className="mx_MTextTile mx_messageTileType" onClick={this.onClick}>
+            <span ref="content" className="mx_MTextTile mx_MessageTile_content" onClick={this.onClick}>
                 {content.body}
             </span>
         );
diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css
index 26f50fcdbe..4176c4b8cc 100644
--- a/skins/base/css/organisms/RoomView.css
+++ b/skins/base/css/organisms/RoomView.css
@@ -19,7 +19,7 @@ limitations under the License.
     position: relative;
 }
 
-.mx_RoomHeader {
+.mx_RoomView .mx_RoomHeader {
     height: 30px;
 }
 
@@ -58,7 +58,7 @@ limitations under the License.
 .mx_RoomView_invitePrompt {
 }
 
-.mx_MemberList {
+.mx_RoomView .mx_MemberList {
     -webkit-box-ordinal-group: 2;
     -moz-box-ordinal-group: 2;
     -ms-flex-order: 2;
@@ -71,12 +71,12 @@ limitations under the License.
     height: 100%;
 }
 
-.mx_MemberList ul {
+.mx_RoomView .mx_MemberList ul {
     margin: 0px;
     padding: 0px;
 }
 
-.mx_MessageComposer {
+.mx_RoomView .mx_MessageComposer {
     width: 100%;
     bottom: 0px;
 }
diff --git a/skins/base/views/molecules/MEmoteTile.js b/skins/base/views/molecules/MEmoteTile.js
index 4992993bca..e7720e160b 100644
--- a/skins/base/views/molecules/MEmoteTile.js
+++ b/skins/base/views/molecules/MEmoteTile.js
@@ -29,7 +29,7 @@ module.exports = React.createClass({
         var content = mxEvent.getContent();
         var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
         return (
-            <span className="mx_MEmoteTile mx_messageTileType">
+            <span className="mx_MEmoteTile mx_MessageTile_content">
                 * {name} {content.body}
             </span>
         );
diff --git a/skins/base/views/molecules/MNoticeTile.js b/skins/base/views/molecules/MNoticeTile.js
index 337b99fd12..f63a8c2cea 100644
--- a/skins/base/views/molecules/MNoticeTile.js
+++ b/skins/base/views/molecules/MNoticeTile.js
@@ -27,7 +27,7 @@ module.exports = React.createClass({
     render: function() {
         var content = this.props.mxEvent.getContent();
         return (
-            <span ref="content" className="mx_MNoticeTile mx_messageTileType">
+            <span ref="content" className="mx_MNoticeTile mx_MessageTile_content">
                 {content.body}
             </span>
         );
diff --git a/skins/base/views/molecules/MRoomMemberTile.js b/skins/base/views/molecules/MRoomMemberTile.js
index 7f202016e3..f0755e2614 100644
--- a/skins/base/views/molecules/MRoomMemberTile.js
+++ b/skins/base/views/molecules/MRoomMemberTile.js
@@ -47,7 +47,7 @@ module.exports = React.createClass({
             <div className="mx_MessageTile">
                 <MessageTimestamp ts={this.props.mxEvent.getTs()} />
                 <span className="mx_SenderProfile"></span>
-                <span className="mx_messageTileType">
+                <span className="mx_MessageTile_content">
                     {this.getMemberEventText()}
                 </span>
             </div>
diff --git a/skins/base/views/molecules/MTextTile.js b/skins/base/views/molecules/MTextTile.js
index eb8f2a737e..d08f42ed9a 100644
--- a/skins/base/views/molecules/MTextTile.js
+++ b/skins/base/views/molecules/MTextTile.js
@@ -27,7 +27,7 @@ module.exports = React.createClass({
     render: function() {
         var content = this.props.mxEvent.getContent();
         return (
-            <span ref="content" className="mx_MTextTile mx_messageTileType">
+            <span ref="content" className="mx_MTextTile mx_MessageTile_content">
                 {content.body}
             </span>
         );
diff --git a/skins/base/views/pages/MatrixChat.js b/skins/base/views/pages/MatrixChat.js
index ba0c712dac..f9e199e6e8 100644
--- a/skins/base/views/pages/MatrixChat.js
+++ b/skins/base/views/pages/MatrixChat.js
@@ -40,8 +40,8 @@ module.exports = React.createClass({
                 <div className="mx_MatrixChat">
                     <div className="mx_MatrixChat_chatWrapper">
                         <div className="mx_MatrixChat_leftPanel">
-                            <MatrixToolbar />
                             <RoomList selectedRoom={this.state.currentRoom} />
+                            <MatrixToolbar />
                         </div>
                         <RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
                     </div>