diff --git a/app/templates/about.jade b/app/templates/about.jade
index 1dfb30cf9..b01292eb6 100644
--- a/app/templates/about.jade
+++ b/app/templates/about.jade
@@ -16,7 +16,7 @@ block content
         span , 
         span(data-i18n="general.and") and
         span  
-        a(href="http://scotterickson.info/") Nick
+        a(href="http://www.nickwinter.net") Nick
         span  
         span(data-i18n="about.who_description_prefix")
           | together started CodeCombat in 2013. We also created 
diff --git a/app/templates/editor/article/edit.jade b/app/templates/editor/article/edit.jade
index eb7f6b19d..a693e8560 100644
--- a/app/templates/editor/article/edit.jade
+++ b/app/templates/editor/article/edit.jade
@@ -2,7 +2,7 @@ extends /templates/base
 
 block content
   button(data-i18n="article.edit_btn_preview").btn.btn-primary#preview-button Preview
-  button(data-i18n="article.edit_btn_save").btn.btn-primary#save-button(data-toggle="coco-modal", data-target="modal/save_version") Save
+  button(data-toggle="coco-modal", data-target="modal/save_version", data-i18n="article.edit_btn_save").btn.btn-primary#save-button Save
 
   h3(data-i18n="article.edit_article_title") Edit Article
     span
diff --git a/app/templates/editor/level/component/new.jade b/app/templates/editor/level/component/new.jade
index bb4965a79..0cbbf74b0 100644
--- a/app/templates/editor/level/component/new.jade
+++ b/app/templates/editor/level/component/new.jade
@@ -6,14 +6,14 @@ block modal-header-content
 block modal-body-content
   form.form-horizontal
     .control-group
-      label(data-i18n="editor.new_component_field_system").control-label(for="level-component-system") System
+      label(for="level-component-system", data-i18n="editor.new_component_field_system").control-label System
       .controls
         input#level-component-system.input-large(name="system", type="text")
     .control-group
-      label(data-i18n="editor.new_component_field_name").control-label(for="level-component-name") Name
+      label(for="level-component-name", data-i18n="editor.new_component_field_name").control-label Name
       .controls
         input#level-component-name.input-large(name="name", type="text")
 
 block modal-footer-content
-  button(data-i18n="editor.new_component_btn_cancel").btn(data-dismiss="modal") Cancel
+  button(data-dismiss="modal", data-i18n="editor.new_component_btn_cancel").btn Cancel
   button(data-i18n="editor.new_component_btn_create").btn.btn-primary#new-level-component-submit Create
diff --git a/app/templates/editor/level/edit.jade b/app/templates/editor/level/edit.jade
index 384b3c7ff..04ca53dcd 100644
--- a/app/templates/editor/level/edit.jade
+++ b/app/templates/editor/level/edit.jade
@@ -13,7 +13,7 @@ block outer_content
         button(data-i18n="editor.level_btn_save").btn.btn-primary#commit-level-start-button Save
         button(data-i18n="editor.level_btn_fork").btn.btn-primary#fork-level-start-button Fork
         .btn-group.play-button-group
-          button(data-i18n="editor.level_btn_play")#play-button.btn.btn-inverse.banner(title="⌃↩ or ⌘↩: Play preview of current level") Play!
+          button(title="⌃↩ or ⌘↩: Play preview of current level", data-i18n="editor.level_btn_play")#play-button.btn.btn-inverse.banner Play!
           button.btn.btn-inverse.banner.dropdown-toggle(data-toggle="dropdown")
             i.icon-cog.icon-white
       
diff --git a/app/templates/editor/level/system/new.jade b/app/templates/editor/level/system/new.jade
index 9632e748f..bb7c2c098 100644
--- a/app/templates/editor/level/system/new.jade
+++ b/app/templates/editor/level/system/new.jade
@@ -6,10 +6,10 @@ block modal-header-content
 block modal-body-content
   form.form-horizontal
     .control-group
-      label(data-i18n="editor.create_system_field_name").control-label(for="level-system-name") Name
+      label(for="level-system-name", data-i18n="editor.create_system_field_name").control-label Name
       .controls
         input#level-system-name.input-large(name="name", type="text")
 
 block modal-footer-content
-  button(data-i18n="editor.create_system_btn_cancel").btn(data-dismiss="modal") Cancel
+  button(data-dismiss="modal", data-i18n="editor.create_system_btn_cancel").btn Cancel
   button(data-i18n="editor.create_system_btn_create").btn.btn-primary#new-level-system-submit Create