diff --git a/default/web_tt2/arcsearch_form.tt2 b/default/web_tt2/arcsearch_form.tt2
index 2d6ae480e..7e7517d74 100644
--- a/default/web_tt2/arcsearch_form.tt2
+++ b/default/web_tt2/arcsearch_form.tt2
@@ -17,6 +17,7 @@
                 <strong>[% archive_name %]</strong>
             </a>
 
+            <label for="key_word">[%|loc%]Search keywords:[%END%]</label>
             <input id="key_word" name="key_word" type="text" size="30" value="[% key_word %]" />
             <input name="action" type="hidden" value="arcsearch" />
             <input class="MainMenuLinks disableIfEmpty" data-selector="#key_word" name="action_arcsearch" type="submit" value="[%|loc%]Search[%END%]" />
diff --git a/default/web_tt2/compose_mail.tt2 b/default/web_tt2/compose_mail.tt2
index 0440d1ca2..608b2901e 100644
--- a/default/web_tt2/compose_mail.tt2
+++ b/default/web_tt2/compose_mail.tt2
@@ -8,8 +8,9 @@
         [%|loc(mailto)%]To: %1[%END%]<br />
         <label for="subject">
             [%|loc%]Subject:[%END%]
-            <input id="subject" type="text" size="45" name="subject" value="[% subject %]" />
         </label>
+        <input id="subject" type="text" size="45" name="subject"
+         value="[% subject %]" />
         [% IF subaction == "html_news_letter" %]
             <input type="hidden" name="html_news_letter" value="[% subaction %]" />
         [% END %]
diff --git a/default/web_tt2/manage_template.tt2 b/default/web_tt2/manage_template.tt2
index ddff2904e..278fa7fa3 100644
--- a/default/web_tt2/manage_template.tt2
+++ b/default/web_tt2/manage_template.tt2
@@ -59,13 +59,10 @@
     [%IF content %]
         <form action="[% path_cgi %]" method="post" name="edit_templates">
             <fieldset>
+                <h2>
+                    [%|loc(message_template)%]Edit rejection message %1[%END%]
+                </h2>
                 <p>
-                    <h2>[%|loc%]Edit[%END%] [% message_template %]</h2>
-                </p>
-                <p>
-                    <!-- [%|loc()%]Message Name:[%END%]<input type="text" name="message_template" value="[% message_template %]"> -->
-                    <!-- <input class="MainMenuLinks" type="submit" name="subaction_default" value="[%|loc%]Default Message[%END%]" /> -->
-
                     <textarea name="content" cols="50" rows="10" wrap="soft">
                         [%~ content ~%]
                     </textarea>
diff --git a/default/web_tt2/rss_request.tt2 b/default/web_tt2/rss_request.tt2
index 092dfdacc..f1ee1d2b6 100644
--- a/default/web_tt2/rss_request.tt2
+++ b/default/web_tt2/rss_request.tt2
@@ -50,8 +50,11 @@
                         <li>
                             <label for="latest_arc">
                                 [%|loc%]latest arc:[%END%]
-                                <input type="text" name="latest_arc" id="latest_arc" size="[% s.length %]" value="[% latest_arc_url %]" />
                             </label>
+                            <input type="text"
+                             name="latest_arc" id="latest_arc"
+                             size="[% s.length %]"
+                             value="[% latest_arc_url %]" />
                         </li>
                     [% END %]
                     [% IF latest_d_read_url %]
@@ -59,8 +62,11 @@
                         <li>
                             <label for="latest_d_read">
                                 [%|loc%]latest document:[%END%]
-                                <input type="text" name="latest_d_read" id="latest_d_read" size="[% s.length %]" value="[% latest_d_read_url %]" />
                             </label>
+                            <input type="text"
+                             name="latest_d_read" id="latest_d_read"
+                             size="[% s.length %]"
+                             value="[% latest_d_read_url %]" />
                         </li>
                     [% END %]
                     [% IF active_lists_url %]
@@ -68,8 +74,11 @@
                         <li>
                             <label for="active_lists">
                                 [%|loc%]active lists:[%END%]
-                                <input type="text" name="active_lists" id="active_lists" size="[% s.length %]" value="[% active_lists_url %]" />
                             </label>
+                            <input type="text"
+                             name="active_lists" id="active_lists"
+                             size="[% s.length %]"
+                             value="[% active_lists_url %]" />
                         </li>
                     [% END %]
                     [% IF latest_lists_url %]
@@ -77,8 +86,11 @@
                         <li>
                             <label for="latest_lists">
                                 [%|loc%]latest lists:[%END%]
-                                <input type="text" name="latest_lists" id="latest_lists" size="[% s.length %]" value="[% latest_lists_url %]" />
                             </label>
+                            <input type="text"
+                             name="latest_lists" id="latest_lists"
+                             size="[% s.length %]"
+                             value="[% latest_lists_url %]" />
                         </li>
                     [% END %]
                 </ul>
diff --git a/default/web_tt2/search_list_request.tt2 b/default/web_tt2/search_list_request.tt2
index a1f515560..10cebc812 100644
--- a/default/web_tt2/search_list_request.tt2
+++ b/default/web_tt2/search_list_request.tt2
@@ -2,7 +2,11 @@
 <h2><i class="fa fa-search"></i> [%|loc%]Search for list(s)[%END%]</h2>
 <form action="[% path_cgi %]" method="post">
     <fieldset>
-        <input type="text" size="14" name="filter_list" value="[% filter_list %]" title="[%|loc%]Enter a list name[%END%]" placeholder="[%|loc%]Enter a list name[%END%]"/>
+        <label for="filter_list">[%|loc%]Search keywords:[%END%]</label>
+        <input type="text" id="filter_list" size="14"
+         name="filter_list" value="[% filter_list %]"
+         title="[%|loc%]Enter a list name[%END%]"
+         placeholder="[%|loc%]Enter a list name[%END%]"/>
         <input type="hidden" name="action" value="search_list" />
         <input class="MainMenuLinks heavyWork" type="submit" name="action_search_list" value="[%|loc%]Search lists[%END%]" />
     </fieldset>
diff --git a/default/web_tt2/serveradmin.tt2 b/default/web_tt2/serveradmin.tt2
index e12039b67..a6b22bb00 100644
--- a/default/web_tt2/serveradmin.tt2
+++ b/default/web_tt2/serveradmin.tt2
@@ -83,7 +83,9 @@
     <form action="[% path_cgi %]" method="post">
         <fieldset>
             <div style="padding-bottom:1.0em;">
-                <input type="text" name="email" size="30" value="[% email %]" />
+                <label for="user_email">[%|loc%]Email address:[%END%]</label>
+                <input type="text" id="user_email" name="email" size="30"
+                 value="[% email %]" />
             </div>
             <input type="hidden" name="action" value="search_user" />
             <input class="MainMenuLinks" type="submit" name="action_search_user" value="[%|loc%]Search User[%END%]" />
@@ -126,6 +128,7 @@
     <p>[%|loc%]Listmasters can switch context (impersonate) other users; this may be useful when providing assistance or when testing privileges.  Enter the email address of the user you'd like to switch context to:[%END%]</p>
     <form class="bold_label" action="[% path_cgi %]" method="post">
         <fieldset>
+            <label for="session_email">[%|loc%]Email address:[%END%]</label>
             <input id="session_email" type="text" name="email" size="50"/>
             <div style="padding-top:1.0em; clear:both;">
                 <input class="MainMenuLinks" type="submit" name="action_set_session_email" value="[%|loc%]Switch User Context[%END%]" />
@@ -143,7 +146,7 @@
 
     <form action="[% path_cgi %]" method="post">
         <fieldset>
-            <label for="list"></label>
+            <label for="list">[%|loc%]List name:[%END%]</label>
             <input id="list" type="text" name="list" size="20" />
             <div style="padding-top:1.0em; padding-bottom:0.25em; float:clear;">
                 <input class="MainMenuLinks" type="submit" name="action_rebuildarc" value="[%|loc%]Rebuild archive[%END%]" />
diff --git a/default/web_tt2/sso_login.tt2 b/default/web_tt2/sso_login.tt2
index 8002b4954..84ca127b5 100644
--- a/default/web_tt2/sso_login.tt2
+++ b/default/web_tt2/sso_login.tt2
@@ -22,14 +22,17 @@
 
             <label for="email">
                 <strong>[%|loc%]Your e-mail address:[%END%]</strong>
-                <br />
-                [% IF init_email %]
-                    [% email %]
-                    <input id="email" type="text" name="email" value="[% init_email %]" />
-                [% ELSE %]
-                    <input id="email" type="text" name="email" value="" />
-                [% END %]
-            </label>&nbsp; &nbsp; &nbsp;
+            </label>
+            <br />
+            [% IF init_email %]
+                [% email %]
+                <input id="email" type="text" name="email"
+                 value="[% init_email %]" />
+            [% ELSE %]
+                <input id="email" type="text" name="email"
+                 value="" />
+            [% END %]
+            &nbsp; &nbsp; &nbsp;
             <input type="submit" name="action_sso_login" value="[%|loc%]Send me a confirmation password[%END%]"/>
         </fieldset>
     </form>