diff --git a/.template-lintrc.js b/.template-lintrc.js
index f387370..f35f61c 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'recommended',
 };
diff --git a/app/templates/components/page-item.hbs b/app/templates/components/page-item.hbs
index d9410a6..8758946 100644
--- a/app/templates/components/page-item.hbs
+++ b/app/templates/components/page-item.hbs
@@ -1,7 +1,7 @@
 {{#if isDots}}
-  <a>
+  <span>
     {{page}}
-  </a>
+  </span>
 {{else}}
   <a href="{{url}}" {{action 'select'}}>
     {{page}}
diff --git a/app/templates/components/pagination-pager.hbs b/app/templates/components/pagination-pager.hbs
index 0fb4f7d..b80c79e 100644
--- a/app/templates/components/pagination-pager.hbs
+++ b/app/templates/components/pagination-pager.hbs
@@ -1,33 +1,9 @@
 <ul class="{{if pager 'pager' 'pagination'}} {{paginationSizeClass}}">
-  {{#unless pager}}
-    <li class="previous {{if isFirstDisabled 'disabled'}}">
-      <a href="{{previousUrl}}" {{action 'previous'}}>
-        {{{paginationPrevious}}}
-      </a>
-    </li>
-
-    {{#each pages key='@index' as |page|}}
-      {{page-item
-        disabled=disabled
-        page=page
-        selected=this.current
-        seperator=seperator
-        urlTemplate=urlTemplate
-        firstPage=firstPage
-        firstPageUrlTemplate=firstPageUrlTemplate
-        pageSet=(action 'pageChanged')
-      }}
-    {{/each}}
-
-    <li class="next {{if isLastDisabled 'disabled'}}">
-      <a href="{{nextUrl}}" {{action 'next'}}>
-        {{{paginationNext}}}
-      </a>
-    </li>
-  {{else}}
+  {{#if pager}}
     {{#if pagerFirst}}
       <li class="{{if isFirstDisabled 'disabled'}}">
         <a href="{{firstUrl}}" {{action 'first'}}>
+          {{! template-lint-disable no-triple-curlies}}
           {{{pagerFirst}}}
         </a>
       </li>
@@ -35,6 +11,7 @@
 
     <li class="{{if pagerSpread 'previous'}} {{if isFirstDisabled 'disabled'}}">
       <a href="{{previousUrl}}" {{action 'previous'}}>
+        {{! template-lint-disable no-triple-curlies}}
         {{{pagerPrevious}}}
       </a>
     </li>
@@ -47,6 +24,7 @@
 
     <li class="{{if pagerSpread 'next'}} {{if isLastDisabled 'disabled'}}">
       <a href="{{nextUrl}}" {{action 'next'}}>
+        {{! template-lint-disable no-triple-curlies}}
         {{{pagerNext}}}
       </a>
     </li>
@@ -54,9 +32,37 @@
     {{#if pagerLast}}
       <li class="last {{if isLastDisabled 'disabled'}}">
         <a href="{{lastUrl}}" {{action 'last'}}>
+          {{! template-lint-disable no-triple-curlies}}
           {{{pagerLast}}}
         </a>
       </li>
     {{/if}}
-  {{/unless}}
+  {{else}}
+    <li class="previous {{if isFirstDisabled 'disabled'}}">
+      <a href="{{previousUrl}}" {{action 'previous'}}>
+        {{! template-lint-disable no-triple-curlies}}
+        {{{paginationPrevious}}}
+      </a>
+    </li>
+
+    {{#each pages key='@index' as |page|}}
+      {{page-item
+        disabled=disabled
+        page=page
+        selected=this.current
+        seperator=seperator
+        urlTemplate=urlTemplate
+        firstPage=firstPage
+        firstPageUrlTemplate=firstPageUrlTemplate
+        pageSet=(action 'pageChanged')
+      }}
+    {{/each}}
+
+    <li class="next {{if isLastDisabled 'disabled'}}">
+      <a href="{{nextUrl}}" {{action 'next'}}>
+        {{! template-lint-disable no-triple-curlies}}
+        {{{paginationNext}}}
+      </a>
+    </li>
+  {{/if}}
 </ul>
\ No newline at end of file
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
index 80deb42..ba3d4bd 100644
--- a/tests/dummy/app/templates/application.hbs
+++ b/tests/dummy/app/templates/application.hbs
@@ -3,7 +3,7 @@
   <div>
     <nav>
       <ul class="nav nav-pills pull-right">
-        <li role="presentation"><a href="https://github.com/knownasilya/pagination-pager">Github</a></li>
+        <li><a href="https://github.com/knownasilya/pagination-pager">Github</a></li>
       </ul>
     </nav>
     <h2>pagination-pager</h2>