diff --git a/opentech/apply/activity/forms.py b/opentech/apply/activity/forms.py
index f5d17d442874690bd657bb5c367025af9c3776ae..af781fb6222cb0913935d5cdc4c5a9abffdaf20a 100644
--- a/opentech/apply/activity/forms.py
+++ b/opentech/apply/activity/forms.py
@@ -13,7 +13,7 @@ class CommentForm(forms.ModelForm):
         fields = ('message', 'visibility')
         labels = {
             'visibility': 'Visible to',
-            'message': '',
+            'message': 'Message',
         }
         widgets = {
             'visibility': forms.RadioSelect(),
diff --git a/opentech/static_src/src/sass/apply/components/_editor.scss b/opentech/static_src/src/sass/apply/components/_editor.scss
index bca2454437a34cd8327be78c34a2b27685a2df48..c66de8971466fd07bbdb62100191f283e0382576 100644
--- a/opentech/static_src/src/sass/apply/components/_editor.scss
+++ b/opentech/static_src/src/sass/apply/components/_editor.scss
@@ -1,9 +1,3 @@
-.wmd-panel {
-}
-
-.wmd-input {
-}
-
 .wmd-preview {
     background-color: $color--sky-blue;
     padding: 0 10px;
@@ -25,32 +19,23 @@
 }
 
 .wmd-button-row {
-    position: relative;
+    display:  flex;
     background-color: $color--white;
-    height: 35px;
-    padding-left: 5px;
-    padding-right: 5px;
-    padding-bottom: 5px;
-    padding-top: 10px;
+    padding:  4px;
 }
 
 .wmd-spacer {
-    position: absolute;
-    display: inline-block;
     background-color: $color--mid-grey;
     width: 1px;
     height: 20px;
-    margin-left: 14px;
+    margin: 0 14px;
     list-style: none;
 }
 
 .wmd-button {
-    position: absolute;
-    display: inline-block;
     width: 20px;
     height: 20px;
-    padding-left: 2px;
-    padding-right: 3px;
+    margin: 0 2px;
     list-style: none;
     cursor: pointer;
 
@@ -64,18 +49,6 @@
     }
 }
 
-.wmd-spacer1 {
-    left: 50px;
-}
-
-.wmd-spacer2 {
-    left: 175px;
-}
-
-.wmd-spacer3 {
-    left: 300px;
-}
-
 .wmd-prompt-background {
     background-color: $color--black;
 }
diff --git a/opentech/static_src/src/sass/public/components/_editor.scss b/opentech/static_src/src/sass/public/components/_editor.scss
index 136e5f10e4d50c24c18176020dd14e06935abb34..259bb56cb135cc80f25337205d97b50ac9846123 100644
--- a/opentech/static_src/src/sass/public/components/_editor.scss
+++ b/opentech/static_src/src/sass/public/components/_editor.scss
@@ -1,9 +1,3 @@
-.wmd-panel {
-}
-
-.wmd-input {
-}
-
 .wmd-preview {
     background-color: $color--sky-blue;
     padding: 0 10px;
@@ -20,33 +14,25 @@
     }
 }
 
+
 .wmd-button-row {
-    position: relative;
+    display:  flex;
     background-color: $color--white;
-    height: 35px;
-    padding-left: 5px;
-    padding-right: 5px;
-    padding-bottom: 5px;
-    padding-top: 10px;
+    padding:  4px;
 }
 
 .wmd-spacer {
-    position: absolute;
-    display: inline-block;
     background-color: $color--mid-grey;
     width: 1px;
     height: 20px;
-    margin-left: 14px;
+    margin: 0 14px;
     list-style: none;
 }
 
 .wmd-button {
-    position: absolute;
-    display: inline-block;
     width: 20px;
     height: 20px;
-    padding-left: 2px;
-    padding-right: 3px;
+    margin: 0 2px;
     list-style: none;
     cursor: pointer;
 
@@ -60,18 +46,6 @@
     }
 }
 
-.wmd-spacer1 {
-    left: 50px;
-}
-
-.wmd-spacer2 {
-    left: 175px;
-}
-
-.wmd-spacer3 {
-    left: 300px;
-}
-
 .wmd-prompt-background {
     background-color: $color--black;
 }