diff --git a/css/converse-muc-embedded.css b/css/converse-muc-embedded.css
index 53556b92b..037e11eeb 100644
--- a/css/converse-muc-embedded.css
+++ b/css/converse-muc-embedded.css
@@ -32,7 +32,7 @@
       box-shadow: none; }
     #converse-embedded-chat .chatbox .chat-title {
       padding: 0.3em;
-      font-size: 150%; }
+      font-size: 120%; }
   #converse-embedded-chat .chatbox-btn {
     display: none; }
   #converse-embedded-chat .chatroom .box-flyout {
@@ -43,7 +43,7 @@
       height: -webkit-calc(100% - 55px);
       height: calc(100% - 55px); }
     #converse-embedded-chat .chatroom .box-flyout .occupants-heading {
-      font-size: 150%; }
+      font-size: 120%; }
     #converse-embedded-chat .chatroom .box-flyout .chat-content {
       height: calc(100% - 97px); }
       #converse-embedded-chat .chatroom .box-flyout .chat-content .chat-message {
diff --git a/css/converse.css b/css/converse.css
index 06f4050be..f10d7ae1f 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -1334,7 +1334,8 @@
       color: #818479; }
     #converse-embedded-chat form.pure-form.converse-form label,
     #conversejs form.pure-form.converse-form label {
-      margin-top: 1em; }
+      margin-top: 1em;
+      font-size: 16px; }
     #converse-embedded-chat form.pure-form.converse-form input[type=text],
     #converse-embedded-chat form.pure-form.converse-form input[type=password],
     #converse-embedded-chat form.pure-form.converse-form input[type=number],
@@ -1345,7 +1346,6 @@
     #conversejs form.pure-form.converse-form input[type=number],
     #conversejs form.pure-form.converse-form input[type=button],
     #conversejs form.pure-form.converse-form input[type=submit] {
-      height: 2.2em;
       padding: 0.5em; }
     #converse-embedded-chat form.pure-form.converse-form input[type=button],
     #converse-embedded-chat form.pure-form.converse-form input[type=submit],
@@ -1353,7 +1353,8 @@
     #conversejs form.pure-form.converse-form input[type=submit] {
       padding-left: 1em;
       padding-right: 1em;
-      margin-right: 1em; }
+      margin: 0.5em 0;
+      border: none; }
     #converse-embedded-chat form.pure-form.converse-form input.error,
     #conversejs form.pure-form.converse-form input.error {
       border: 1px solid red;
@@ -1891,7 +1892,7 @@
       color: #818479;
       display: block;
       overflow: hidden;
-      padding: 0.4em;
+      padding: 0.1em;
       text-shadow: 0 1px 0 #FAFAFA;
       word-wrap: break-word; }
       #conversejs #controlbox #chatrooms dl.rooms-list dd.available-chatroom:hover {
@@ -2378,7 +2379,7 @@
                 #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-online, #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-chat,
                 #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-online,
                 #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-chat {
-                  background-color: green; }
+                  background-color: #1A9707; }
                 #converse-embedded-chat .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-dnd,
                 #conversejs .chatroom .box-flyout .chatroom-body .occupants ul li.occupant .occupant-status.occupant-dnd {
                   background-color: red; }
@@ -2414,6 +2415,11 @@
         #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container .chatroom-form label,
         #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container .chatroom-form input[type=text] {
           display: block; }
+        #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container input[type=button],
+        #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container input[type=submit],
+        #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container input[type=button],
+        #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container input[type=submit] {
+          margin: 0 0.5em; }
   #converse-embedded-chat .chatroom .chat-textarea,
   #conversejs .chatroom .chat-textarea {
     border-bottom-right-radius: 0; }
@@ -2484,7 +2490,11 @@
   #conversejs #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom a.room-info {
     clear: none; }
   #conversejs #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom a.open-room {
-    width: 75%; }
+    width: 75%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding-right: 0.5em; }
   #conversejs #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom .remove-bookmark {
     float: right; }
 
diff --git a/demo/embedded.html b/demo/embedded.html
index 1fe4ab547..aeb44ba2c 100644
--- a/demo/embedded.html
+++ b/demo/embedded.html
@@ -18,7 +18,7 @@
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 9]>
     <script src="../node_modules/requirejs/require.js"></script>
-    <script src="../config.js"></script>
+    <script src="../src/config.js"></script>
     <![endif]>
 </head>
 
diff --git a/sass/_bookmarks.scss b/sass/_bookmarks.scss
index 9fd5a4a57..5e1469b73 100644
--- a/sass/_bookmarks.scss
+++ b/sass/_bookmarks.scss
@@ -18,6 +18,10 @@
                             }
                             &.open-room {
                                 width: 75%;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                                padding-right: 0.5em;
                             }
                         }
                         .remove-bookmark {
diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss
index d2d585642..34c558ca7 100644
--- a/sass/_chatrooms.scss
+++ b/sass/_chatrooms.scss
@@ -146,7 +146,7 @@
 									height: 0.5em;
                                     &.occupant-online,
                                     &.occupant-chat {
-                                        background-color: green;
+                                        background-color: #1A9707;
                                     }
                                     &.occupant-dnd {
                                         background-color: red;
@@ -188,6 +188,10 @@
                             display: block;
                         }
                     }
+                    input[type=button],
+                    input[type=submit] {
+                        margin: 0 0.5em;
+                    }
                 }
             }
         }
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index 9ee6de350..8975e8bc3 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -132,7 +132,7 @@
                     color: $text-color;
                     display: block;
                     overflow: hidden;
-                    padding: 0.4em;
+                    padding: 0.1em;
                     text-shadow: 0 1px 0 $text-shadow-color;
                     word-wrap: break-word;
                     &:hover {
diff --git a/sass/_core.scss b/sass/_core.scss
index 8ee5df1bc..132a19907 100644
--- a/sass/_core.scss
+++ b/sass/_core.scss
@@ -171,20 +171,21 @@
             }
             label {
                 margin-top: 1em;
+                font-size: $font-size-large;
             }
             input[type=text],
             input[type=password],
             input[type=number],
             input[type=button],
             input[type=submit] {
-                height: 2.2em;
                 padding: 0.5em;
             }
             input[type=button],
             input[type=submit] {
                 padding-left: 1em;
                 padding-right: 1em;
-                margin-right: 1em;
+                margin: 0.5em 0;
+                border: none;
             }
             input.error {
                 border: 1px solid red;
diff --git a/sass/_muc_embedded.scss b/sass/_muc_embedded.scss
index e2807c4d5..3de31bc76 100644
--- a/sass/_muc_embedded.scss
+++ b/sass/_muc_embedded.scss
@@ -36,7 +36,7 @@
         }
         .chat-title {
             padding: 0.3em;
-            font-size: 150%;
+            font-size: 120%;
         }
     }
     .chatbox-btn {
@@ -51,7 +51,7 @@
                 @include calc(height, '100% - #{$chat-head-height}');
             }
             .occupants-heading {
-                font-size: 150%;
+                font-size: 120%;
             }
             .chat-content {
                 height: calc(100% - #{$toolbar-height + $chat-textarea-height +2px});