diff --git a/Pivot.skin.php b/Pivot.skin.php
index 93b2c5a..93e5b2d 100644
--- a/Pivot.skin.php
+++ b/Pivot.skin.php
@@ -116,10 +116,10 @@ class pivotTemplate extends BaseTemplate {
       					<ul class="off-canvas-list">
 						
 								<li class="has-form">
-									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform-offCanvas" class="mw-search">
+									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
 										<div class="row collapse">
 											<div class="small-12 columns">
-												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" class="mw-searchInput" autocomplete="off">
+												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
 											</div>
 										</div>
 									</form>
@@ -132,16 +132,10 @@ class pivotTemplate extends BaseTemplate {
 					<aside class="right-off-canvas-menu">
 					  <ul class="off-canvas-list">
 					<?php if ($wgUser->isLoggedIn()): ?>
-						<li id="personal-tools"><label><?php echo wfMessage( 'personaltools' )->text() ?></label></li>
+						<li id="personal-tools"><label><?php echo wfMessage( 'pivot-personal-tools' )->text() ?></label></li>
 						<?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?>
 							<?php else: ?>
-								<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
-									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
-								<?php elseif (isset($this->data['personal_urls']['login'])): ?>
-									<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
-										<?php else: ?>
-											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li>
-								<?php endif; ?>
+								<?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?>
 							<?php endif; ?>
 					  </ul>
 					</aside>
@@ -161,10 +155,10 @@ class pivotTemplate extends BaseTemplate {
 												<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height: auto;display: inline-block; vertical-align: middle;"></a>		
 											</li>
 											<li class="has-form">
-												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform-sidebar" class="mw-search">
+												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
 													<div class="row collapse">
 														<div class="small-12 columns">
-															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" class="mw-searchInput" autocomplete="off">
+															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
 														</div>
 													</div>
 												</form>
diff --git a/i18n/en.json b/i18n/en.json
index 4b10201..35ec966 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,5 +7,6 @@
 	"skinname-pivot": "Pivot",
 	"pivot-desc": "A mobile skin which \"Pivots\" seamlessly to any size display.",
 	"pivot-browsermsg": "may not look as expected in this version of Internet Explorer. We recommend you upgrade to a newer version of Internet Explorer or switch to a browser like Firefox or Chrome.",
-	"pivot-menutitle": "Menu"
+	"pivot-menutitle": "Menu",
+	"pivot-personal-tools": "Personal Tools"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a99b3c0..0642121 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,5 +7,6 @@
 	"skinname-pivot": "name of skin",
 	"pivot-desc": "description of skin",
 	"pivot-browsermsg": "old versions of IE not supported message",
-	"pivot-menutitle": "menu title"
+	"pivot-menutitle": "menu title",
+	"pivot-personal-tools": "logged in title for personal tools"
 }
\ No newline at end of file