diff --git a/pageheader/lang/C/messages.po b/pageheader/lang/C/messages.po
index e0fdbb356..f8958d2fa 100644
--- a/pageheader/lang/C/messages.po
+++ b/pageheader/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pageheader.php:50
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: pageheader.php:55
-msgid "Submit"
+#: pageheader.php:54
+msgid "Message"
 msgstr ""
 
-#: pageheader.php:68
+#: pageheader.php:54
+msgid ""
+"Message to display on every page on this server (or put a pageheader.html "
+"file in your docroot)"
+msgstr ""
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr ""
+
+#: pageheader.php:69
 msgid "pageheader Settings saved."
 msgstr ""
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 7b6924167..eb121fb53 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -48,14 +48,12 @@ function pageheader_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = '';
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . L10n::t('"pageheader" Settings') . '</h3>';
-    $s .= '<div id="pageheader-wrapper">';
-    $s .= '<label id="pageheader-label" for="pageheader-words">' . L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)') . ' </label>';
-    $s .= '<textarea id="pageheader-words" type="text" name="pageheader-words">' . $words . '</textarea>';
-    $s .= '</div><div class="clear"></div>';
-
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+	$t = get_markup_template("settings.tpl", "addon/pageheader/");
+	$s .= replace_macros($t, [
+					'$title' => L10n::t('"pageheader" Settings'),
+					'$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
+					'$submit' => L10n::t('Save Settings')
+	]);
 
 	return;
 
diff --git a/pageheader/templates/settings.tpl b/pageheader/templates/settings.tpl
new file mode 100644
index 000000000..db1a4093a
--- /dev/null
+++ b/pageheader/templates/settings.tpl
@@ -0,0 +1,14 @@
+<span id="settings_pageheader_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_pageheader_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
+	{{include file="field_textarea.tpl" field=$phwords}}
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>
+<div class="clear"></div>