diff --git a/app/components/page-layout-with-search.js b/app/components/page-layout-with-search.js
index 4e4eaaae..9b70a0a3 100644
--- a/app/components/page-layout-with-search.js
+++ b/app/components/page-layout-with-search.js
@@ -9,9 +9,6 @@ export default Ember.Component.extend(FocusableComponent, {
   routing: Ember.inject.service('-routing'),
   focusNode: '#search-input',
   showCategories: true,
-  didInsertElement() {
-    this.focus();
-  },
   init() {
     this._super(...arguments);
     this.get('search').perform(this.get('query'));
diff --git a/app/styles/components/_page-layout-with-search.scss b/app/styles/components/_page-layout-with-search.scss
index 5a7f775f..303f591c 100644
--- a/app/styles/components/_page-layout-with-search.scss
+++ b/app/styles/components/_page-layout-with-search.scss
@@ -33,6 +33,10 @@
       margin-top: 1.5rem;
     }
 
+    .search-wrapper button {
+      padding: 0; background: none;
+    }
+
     .name {
       color: #70B3DB;
       font-size: 2rem;
diff --git a/app/templates/addons.hbs b/app/templates/addons.hbs
index e2147cab..485f27a7 100644
--- a/app/templates/addons.hbs
+++ b/app/templates/addons.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{focusing-outlet}}
\ No newline at end of file
diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index 3cdcecd5..5dcd32da 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -1,2 +1,2 @@
-{{outlet}}
+{{focusing-outlet}}
 
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 5060fd09..44c3870c 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -1,6 +1,6 @@
 <div class="container">
   {{#page-layout-with-search query=query showCategories=shouldShowCategories}}
-    {{outlet}}
+    {{focusing-outlet}}
   {{/page-layout-with-search}}
   <footer class="footer" role="contentinfo">
     <hr>
diff --git a/app/templates/categories.hbs b/app/templates/categories.hbs
index e2147cab..485f27a7 100644
--- a/app/templates/categories.hbs
+++ b/app/templates/categories.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{focusing-outlet}}
\ No newline at end of file
diff --git a/app/templates/components/page-layout-with-search.hbs b/app/templates/components/page-layout-with-search.hbs
index fdd28c23..505bcc7e 100644
--- a/app/templates/components/page-layout-with-search.hbs
+++ b/app/templates/components/page-layout-with-search.hbs
@@ -3,7 +3,7 @@
     <header class="navigation">
       {{#link-to "index" (query-params query="") class="name"}}Ember Observer{{/link-to}}
       <nav class="links">
-        {{#link-to "about"}}| About |{{/link-to}}
+        {{#link-to "about"}}About{{/link-to}}
       </nav>
       {{!--<a href="#" class="show-menu"><span class="icon-more-horiz"></span></a>--}}
       <div class="search-wrapper">
@@ -15,11 +15,11 @@
                value={{query}}
                oninput={{action (perform search) value="target.value"}}>
         {{#if query}}
-          <a href="#" {{action clearSearch}} class="icon-close test-clear-search"></a>
+          <button {{action clearSearch}} class="icon-close test-clear-search"></button>
         {{/if}}
       </div>
       {{#if session.isAuthenticated}}
-        <a href="#" {{action logoutUser}} class="logout">Log out</a>
+        <button {{action logoutUser}} class="logout">Log out</button>
       {{/if}}
       <h6 class="no-results {{if hasSearchedAndNoResults 'showing'}}">No results found for "{{query}}"</h6>
     </header>
diff --git a/app/templates/lists.hbs b/app/templates/lists.hbs
index e2147cab..485f27a7 100644
--- a/app/templates/lists.hbs
+++ b/app/templates/lists.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{focusing-outlet}}
\ No newline at end of file
diff --git a/app/templates/maintainers.hbs b/app/templates/maintainers.hbs
index e2147cab..485f27a7 100644
--- a/app/templates/maintainers.hbs
+++ b/app/templates/maintainers.hbs
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{focusing-outlet}}
\ No newline at end of file
diff --git a/package.json b/package.json
index e6389f27..a81b141a 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "active-model-adapter": "^2.1.1",
     "broccoli-asset-rev": "^2.2.0",
     "broccoli-jscs": "^1.4.0",
+    "ember-a11y": "0.1.7",
     "ember-ajax": "0.7.1",
     "ember-cli": "2.4.2",
     "ember-cli-app-version": "^1.0.0",