diff --git a/app/views/neopets_pages/new.html.haml b/app/views/neopets_pages/new.html.haml
index d375738f..fe9743e9 100644
--- a/app/views/neopets_pages/new.html.haml
+++ b/app/views/neopets_pages/new.html.haml
@@ -22,21 +22,18 @@
   
   %ol
     %li
-      = t '.help.check_frame.header_html',
-          :page_link => link_to(t('.help.check_frame.page_link_content',
-                                  :name => @neopets_page.name,
-                                  :index => @neopets_page.index),
-                                @neopets_page.url)
+      = twl '.help.check_frame.header', :page_link_url => @neopets_page.url,
+            :name => @neopets_page.name, :index => @neopets_page.index
       %ul
         %li
           %strong= t '.help.check_frame.check_login.summary'
           = t '.help.check_frame.check_login.details'
         %li
           %strong
-            = t '.help.check_frame.login.summary_html',
-                :login_link => link_to_neopets_login(t('.help.check_frame.login.summary_login_link_content'))
-          = t '.help.check_frame.login.details_html',
-              :login_link => link_to_neopets_login(t('.help.check_frame.login.details_login_link_content'))
+            = twl '.help.check_frame.login.summary',
+                  :login_link_url => neopets_login_url
+          = twl '.help.check_frame.login.details',
+                :login_link_url => neopets_login_url
         %li
           %strong
             = t '.help.check_frame.check_content.summary',
@@ -51,11 +48,10 @@
         %li
           = t '.help.view_source.firefox_html'
         %li
-          = t '.help.view_source.other_html'
+          = t '.help.view_source.other'
         %li
-          = t '.help.view_source.troubleshooting_html',
-              :page_link => link_to(t('.help.view_source.troubleshooting_page_link_content'),
-                                      @neopets_page.url)
+          = twl '.help.view_source.troubleshooting',
+              :page_link_url => @neopets_page.url
     
     %li
       = t '.help.copy_source.header'
diff --git a/config/locales/en-meep.yml b/config/locales/en-meep.yml
index 500108be..6d79e9ff 100644
--- a/config/locales/en-meep.yml
+++ b/config/locales/en-meep.yml
@@ -379,11 +379,11 @@ en-meep:
           Neopets.com %{name} data into your Dress to Impress meepit list.
           Here's how it meeps.
         check_frame:
-          header_html:
-            Check the framed Neopets.com meep on the left,
-            meeping to %{page_link}.
-          page_link_content:
-            meep %{index} of your %{name}
+          header:
+            main_html:
+              Check the framed Neopets.com meep on the left,
+              meeping to %{page_link}.
+            page_link_content: meep %{index} of your %{name}
           check_login:
             summary: Confirm that you're meeped in.
             details:
@@ -391,14 +391,16 @@ en-meep:
               you're not, try enabling "third-party cookies" in your browser.
               (Most have meeped on by default.)
           login:
-            summary_html: If you haven't meeped in, %{login_link}.
-            summary_login_link_content: do so in another meepit
-            details_html:
-              It's never a good idea to meep in inside of a frame, unless
-              you're a web programmer pro who can meep that the frame does, in
-              fact, meep to Neopets.com. To be safe, %{login_link}.
-            details_login_link_content:
-              meep up another window, meep the URL, and meep in safely
+            summary:
+              main_html: If you haven't meeped in, %{login_link}.
+              login_link_content: do so in another meepit
+            details:
+              main_html:
+                It's never a good idea to meep in inside of a frame, unless
+                you're a web programmer pro who can meep that the frame does,
+                in fact, meep to Neopets.com. To be safe, %{login_link}.
+              login_link_content:
+                meep up another window, meep the URL, and meep in safely
           check_content:
             summary: Meep that the page is, in fact, your %{name}.
             details:
@@ -416,10 +418,11 @@ en-meep:
             Source</strong>.
           other_html:
             In other meepits, right-meep and look for something similar.
-          troubleshooting_html:
-            If you're still having trouble, try %{page_link}, right-meeping,
-            and meeping View Source.
-          troubleshooting_page_link_content: meeping the page in a new window
+          troubleshooting:
+            main_html:
+              If you're still having trouble, try %{page_link}, right-meeping,
+              and meeping View Source.
+            page_link_content: meeping the page in a new window
         copy_source:
           header:
             Meeplight the entire source code,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f06749ce..943d5ad9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -379,11 +379,11 @@ en:
           %{name} data into your Dress to Impress items list. Here's how it
           works.
         check_frame:
-          header_html:
-            Check the framed Neopets.com window on the left,
-            pointing to %{page_link}.
-          page_link_content:
-            page %{index} of your %{name}
+          header:
+            main_html:
+              Check the framed Neopets.com window on the left,
+              pointing to %{page_link}.
+            page_link_content: page %{index} of your %{name}
           check_login:
             summary: Confirm that you're logged in.
             details:
@@ -391,14 +391,16 @@ en:
               you're not, try enabling "third-party cookies" in your browser.
               (Most have that on by default.)
           login:
-            summary_html: If you haven't logged in, %{login_link}.
-            summary_login_link_content: do so in another window
-            details_html:
-              It's never a good idea to log in inside of a frame, unless you're
-              a web programmer pro who can check that the frame does, in fact,
-              point to Neopets.com. To be safe, %{login_link}.
-            details_login_link_content:
-              pull up another window, check the URL, and log in safely
+            summary:
+              main_html: If you haven't logged in, %{login_link}.
+              login_link_content: do so in another window
+            details:
+              main_html:
+                It's never a good idea to log in inside of a frame, unless
+                you're a web programmer pro who can check that the frame does,
+                in fact, point to Neopets.com. To be safe, %{login_link}.
+              login_link_content:
+                pull up another window, check the URL, and log in safely
           check_content:
             summary: Confirm that the page is, in fact, your %{name}.
             details:
@@ -414,12 +416,13 @@ en:
             <strong>In Firefox</strong>, right-click the frame, choose
             <strong>This Frame</strong>, then <strong>View Frame
             Source</strong>.
-          other_html:
+          other:
             In other browsers, right-click and look for something similar.
-          troubleshooting_html:
-            If you're still having trouble, try %{page_link}, right-clicking,
-            and choosing View Source.
-          troubleshooting_page_link_content: opening the page in a new window
+          troubleshooting:
+            main_html:
+              If you're still having trouble, try %{page_link}, right-clicking,
+              and choosing View Source.
+            page_link_content: opening the page in a new window
         copy_source:
           header:
             Highlight the entire source code,