diff --git a/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m b/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m
index 5cca3977..591fa718 100644
--- a/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m
+++ b/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m
@@ -79,5 +79,11 @@ - (NSString*)twitterUsername {
 	return @"";
 }
 
+// Name of the plist file that defines the class names of the sharers to use. Usually should not be changed, but 
+// this allows you to subclass a sharer and have the subclass be used.
+- (NSString*)sharersPlistName {
+	return @"WMSHKSharers.plist";
+}
+
 
 @end
diff --git a/assets/www/app.css b/assets/www/app.css
index a2bdab05..2bdd304e 100644
--- a/assets/www/app.css
+++ b/assets/www/app.css
@@ -324,6 +324,7 @@ header
 	right: 0px;
 	top: 0px;
 	width: 44px;
+	border: 0;
 	border-left: 1px solid #777;
 }
 
@@ -336,6 +337,7 @@ header
 	right: 44px;
 	top: 0px;
 	width: 44px;
+	border: 0;
 	border-left: 1px solid #777;
 }
 
diff --git a/assets/www/index.html b/assets/www/index.html
index 66e768eb..62dc8f56 100644
--- a/assets/www/index.html
+++ b/assets/www/index.html
@@ -51,7 +51,7 @@
 	<div id="templates">
 		<script type="text/html" id="settings-page-template">
 			<div class="item">
-				<label><msg key="settings-language-label"></msg></label>
+				<label for="contentLanguageSelector"><msg key="settings-language-label"></msg></label>
 				<p id="selectedLanguage"></p>
 				<select id='contentLanguageSelector'>
 					{{#languages}}
@@ -61,7 +61,7 @@
 			</div>
 
 			<div class="item">
-				<label><msg key="settings-font-size-label"></msg></label>
+				<label for="fontSizeSelector"><msg key="settings-font-size-label"></msg></label>
 				<p><msg key="settings-font-size-desc"></msg></p>
 				<select id="fontSizeSelector">
 					{{#fontSizes}}
@@ -162,10 +162,10 @@
 	<header id="mainHeader">
 		<div class="titlebar" id="titlebar">
 			<div id="searchFormHolder">
-			<div class="titlebarIcon" role="button"></div>
+			<button class="titlebarIcon" title-msg="menu-home"></button>
 			<form id="searchForm">
 				<input type="text" id="searchParam" placeholder-msg="search-placeholder"></input>
-				<input type="submit" id="search" value=""></input>
+				<button type="submit" id="search" value="" title-msg="search-button"></button>
 			</form>
 			<div id="clearSearch"></div>
 			<div class="spinner"></div>
@@ -177,7 +177,7 @@
 		<header>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="about-page-title">About</msg></div>
-				<div class="titlebarItem closeButton"></div>
+				<button class="titlebarItem closeButton" title-msg="about-close"></button>
 			</div>
 		</header>
 		<div class="scroller">
@@ -195,8 +195,8 @@
 		<header>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="saved-pages-title">Saved Pages</msg></div>
-				<div class="titlebarItem closeButton"></div>
-				<div class="titlebarItem cleanButton"></div>
+				<button class="titlebarItem closeButton" title-msg="saved-pages-close"></button>
+				<button class="titlebarItem cleanButton" title-msg="saved-pages-clear-all"></button>
 			</div>
 		</header>
 		<div class="scroller">
@@ -208,8 +208,8 @@
 		<header>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="history-title">History</msg></div>
-				<div class="titlebarItem closeButton"></div>
-				<div class="titlebarItem cleanButton"></div>
+				<button class="titlebarItem closeButton" title-msg="history-close"></button>
+				<button class="titlebarItem cleanButton" title-msg="history-clear-all"></button>
 			</div>
 		</header>
 		<div class="scroller">
@@ -229,7 +229,7 @@
 		<div>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="settings-title">Settings</msg></div>
-				<div class="titlebarItem closeButton"></div>
+				<button class="titlebarItem closeButton" title-msg="settings-close"></button>
 			</div>
 		</div>
 		<div>
@@ -241,7 +241,7 @@
 		<header>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="langlinks-title">Read article in...</msg></div>
-				<div class="titlebarItem closeButton"></div>
+				<button class="titlebarItem closeButton" title-msg="langlinks-close"></button>
 			</div>
 		</header>
 		<div class="scroller">
@@ -257,7 +257,7 @@
 		<header>
 			<div class="titlebar">
 				<div class="titlebarItem"><msg key="nearby-title">Nearby</msg></div>
-				<div class="titlebarItem closeButton"></div>
+				<button class="titlebarItem closeButton" title-msg="nearby-close"></button>
 			</div>
 		</header>
 		<div id="map"></div>
diff --git a/assets/www/messages/messages-en.properties b/assets/www/messages/messages-en.properties
index 62bead31..7a61160d 100644
--- a/assets/www/messages/messages-en.properties
+++ b/assets/www/messages/messages-en.properties
@@ -2,6 +2,8 @@
 sitename = Wikipedia
 spinner-loading = Loading…
 spinner-retrieving = Retrieving content from $1…
+saved-pages-clear-all = Clear all saved pages
+saved-pages-close = Close saved pages screen
 saved-pages-max-warning = You have reached the maximum number of saved pages.
 page-saved = $1 saved.
 page-already-saved = $1 already saved.
@@ -10,6 +12,7 @@ clear-all-history-prompt = Clear history?
 clear-all-saved-pages-prompt = Clear all saved pages?
 saved-page-removed = $1 has been removed.
 saved-pages-title = Saved pages
+menu-home = Wikipedia homepage
 menu-language = Read in…
 menu-savePage = Save page
 menu-savedPages = Saved pages
@@ -24,6 +27,7 @@ menu-about = About
 menu-cancel = Cancel
 menu-output = Output
 menu-sources = Sources
+settings-close = Close settings screen
 settings-title = Settings
 settings-app-version-label = Application version:
 settings-android-version-label = Android version:
@@ -35,6 +39,7 @@ settings-font-size-desc = Set page font size
 settings-font-size-smaller = Small
 settings-font-size-normal = Normal
 settings-font-size-larger = Large
+langlinks-close = Close read in other languages screen
 langlinks-title = Read page in…
 error-not-available = Sorry, this page is not available.
 error-offline = You are offline and the page has not been previously saved.
@@ -44,14 +49,19 @@ error-not-found = Sorry, no page by that name exists.
 error-not-found-reason = You might have mis-spelt the title, or the page has not been created.
 error-search-again = Please search for another term.
 about-page-label = About Us
+history-clear-all = Clear history
+history-close = Close history screen
 history-title = History
+about-close = Close about screen
 about-page-title = About
 about-version = Version
 about-copyright = This application is copyright (C) Wikimedia Foundation and contributing developers
 about-license = This application is free software under the GNU General Public License. You are welcome to distribute and modify it under certain conditions. See http://www.gnu.org/licenses/old-licenses/gpl-2.0.html for details. The source code is available at https://github.com/Wikimedia/WikipediaMobile
+nearby-close = Close nearby pages screen
 nearby-title = Nearby pages
 app-description = Official Wikipedia App for Android. Wikipedia is the free encyclopedia containing more than 20 million articles in 280 languages, and is the most comprehensive and widely used reference work humans have ever compiled.\n\nFeatures: Save article to read later or offline, Search articles nearby, Share articles using Android "Share" function, Read article in a different language, Full screen search\n\nSend us your feedback on Twitter @WikimediaMobile.
 search-results-did-you-mean-label = Did you mean:
 search-results-no-results = No results found
-search-results-close = Close
+search-results-close = Close search results
+search-button = Search Wikipedia for this text
 search-placeholder = Search