diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index 60d358f..d73ef0c 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -87,7 +87,8 @@
         # add things after the default submit button
         fields = ew_core.NameList()
         if self.show_subscribe_checkbox:
-            fields.append(ew.Checkbox(name='subscribe', label='Subscribe to this merge request', value=True))
+            fields.append(ew.Checkbox(name='subscribe', label='Subscribe to this merge request', value=True,
+                                      attrs={'class': 'subscribe-checkbox'}))
         return fields
 
 
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 6c7db3b..ae910c0 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2630,6 +2630,21 @@
 .edit_post_form.reply .arw {
   display: none;
 }
+.edit_markdown_form .btn.link.attachment_form_add_button {
+    margin: 0 0 5px 5px;
+}
+.subscribe-checkbox {
+    margin-top: 7px;
+}
+.pad .editbox label.subscribe {
+    font-weight: normal;  /* override .pad .editbox label */
+}
+.btn.link.cancel_edit_post,
+.btn.link.cancel_form
+{
+    float:right;
+    margin-right: 35px;
+}
 
 #create_new_topic select {
   width: auto;
@@ -2919,6 +2934,10 @@
 #forge_wiki_browse tr.deleted a {
   color: red;
 }
+#page_edit_form input[value=Cancel] {
+    float: right;
+    margin-right: 40px;
+}
 
 .scm-branch-label, .scm-tag-label {
   -moz-border-radius: 4px;
diff --git a/Allura/allura/templates/widgets/edit_post.html b/Allura/allura/templates/widgets/edit_post.html
index 49a8242..6f0de46 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -34,7 +34,7 @@
     <input type="submit" value="{{submit_text}}" />
     {% if primary_artifact and c.user and c.user != c.user.anonymous() and not primary_artifact.subscribed() %}
       <label class="subscribe">
-        <input type="checkbox" checked name="subscribe">Subscribe to this {{ primary_artifact.type_name }}
+        <input type="checkbox" checked name="subscribe" class="subscribe-checkbox">Subscribe to this {{ primary_artifact.type_name }}
       </label>
     {% endif %}
     <a href="#" class="ui-button btn link cancel_edit_post">Cancel</a>
diff --git a/Allura/allura/templates/widgets/new_topic_post.html b/Allura/allura/templates/widgets/new_topic_post.html
index 8910187..e62249e 100644
--- a/Allura/allura/templates/widgets/new_topic_post.html
+++ b/Allura/allura/templates/widgets/new_topic_post.html
@@ -52,7 +52,7 @@
       {% if c.user and c.user != c.user.anonymous() and not (subscribed or subscribed_to_tool) %}
         {# subscribed is per-forum and won't change if they change the forum dropdown value, but better than nothing? :( #}
         <label class="subscribe">
-          <input type="checkbox" checked name="subscribe">Subscribe to this topic
+          <input type="checkbox" checked name="subscribe" class="subscribe-checkbox">Subscribe to this topic
         </label>
       {% endif %}
       <a href=".." class="btn link cancel_form">Cancel</a>
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html b/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
index 9030e87..4790d3e 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
@@ -53,7 +53,7 @@
     {% endfor %}
     {% if c.user and c.user != c.user.anonymous() and widget.fields.subscribe|default and not subscribed_to_tool %}
       <label class="subscribe">
-        <input type="checkbox" checked name="subscribe">Subscribe to this blog post
+        <input type="checkbox" checked name="subscribe" class="subscribe-checkbox">Subscribe to this blog post
       </label>
     {% endif %}
     <a href="{{c.app.url}}" class="btn link cancel_form">Cancel</a>
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index bf280f8..3afc9eb 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -128,7 +128,7 @@
     {{widget.display_field_by_name('submit')|safe}}
     {% if c.user and c.user != c.user.anonymous() and not ticket and not subscribed_to_tool|default %}
         <label class="subscribe">
-          <input type="checkbox" checked name="ticket_form.subscribe">Subscribe to this ticket
+          <input type="checkbox" checked name="ticket_form.subscribe" class="subscribe-checkbox">Subscribe to this ticket
         </label>
     {% endif %}
     <a href="{{c.app.url}}" class="btn link cancel_form">Cancel</a>
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index 2b468e8..0fbadad 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -72,7 +72,7 @@
     <input type="reset" value="Cancel">
     {% if c.user and c.user != c.user.anonymous() and not subscribed_to_tool %}
       <label class="subscribe">
-        <input type="checkbox" checked name="subscribe">Subscribe to this wiki page
+        <input type="checkbox" checked name="subscribe" class="subscribe-checkbox">Subscribe to this wiki page
       </label>
     {% endif %}
 	</div>