diff --git a/app/templates/components/item-types.hbs b/app/templates/components/item-types.hbs
index 0d7c5943a7..41166abf8c 100644
--- a/app/templates/components/item-types.hbs
+++ b/app/templates/components/item-types.hbs
@@ -10,17 +10,17 @@
       <ul>
         {{#each @sorted as |itemType|}}
           <li class={{this.typeClass}}>
-            {{#link-to
-              (if (eq @type "model") "records" "container-type")
-              (escape-url itemType.name)
+            <LinkTo
+              @route={{if (eq @type "model") "records" "container-type"}}
+              @model={{escape-url itemType.name}}
               class="nav__item"
-            }}
+            >
               <span class={{concat this.typeClass "-name" " nav__item-label"}}>
                 {{itemType.name}}
               </span>
 
               <span class={{concat this.typeClass "-count" " pill"}}>{{itemType.count}}</span>
-            {{/link-to}}
+            </LinkTo>
           </li>
         {{/each}}
       </ul>
diff --git a/app/templates/components/side-nav.hbs b/app/templates/components/side-nav.hbs
index c066d5b1f6..2696d40000 100644
--- a/app/templates/components/side-nav.hbs
+++ b/app/templates/components/side-nav.hbs
@@ -1,35 +1,35 @@
 <nav class="nav nav--main">
   <ul>
     <li>
-      {{#link-to "component-tree" class="nav__item"}}
+      <LinkTo @route="component-tree" class="nav__item">
         {{svg-jar "nav-components" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Components</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
     <li>
-      {{#link-to "route-tree" class="nav__item"}}
+      <LinkTo @route="route-tree" class="nav__item">
         {{svg-jar "nav-route-tree" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Routes</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
     <li>
-      {{#link-to "data" class="nav__item"}}
+      <LinkTo @route="data" class="nav__item">
         {{svg-jar "nav-data" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Data</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
     <li>
-      {{#link-to "deprecations" class="nav__item"}}
+      <LinkTo @route="deprecations" class="nav__item">
         {{svg-jar "nav-deprecations" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Deprecations</span>
         <span class="pill">{{@deprecationCount}}</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
     <li>
-      {{#link-to "info" class="nav__item"}}
+      <LinkTo @route="info" class="nav__item">
         {{svg-jar "nav-info" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Info</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
   </ul>
 
@@ -37,19 +37,19 @@
 
   <ul>
     <li>
-      {{#link-to "promise-tree" class="nav__item"}}
+      <LinkTo @route="promise-tree" class="nav__item">
         {{svg-jar "nav-promises" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Promises</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
     <li>
-      {{#link-to "container-types" class="nav__item"}}
+      <LinkTo @route="container-types" class="nav__item">
         {{svg-jar "nav-container" width="20px" height="20px" class="nav__item-icon"}}
         <span class="nav__item-label">Container</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
     <li>
-      {{#link-to "render-tree" class="nav__item"}}
+      <LinkTo @route="render-tree" class="nav__item">
         {{svg-jar
           "nav-render-performance"
           width="20px"
@@ -57,7 +57,7 @@
           class="nav__item-icon"
         }}
         <span class="nav__item-label">Render Performance</span>
-      {{/link-to}}
+      </LinkTo>
     </li>
   </ul>
 </nav>
diff --git a/app/templates/nav.hbs b/app/templates/nav.hbs
deleted file mode 100644
index ce4045d564..0000000000
--- a/app/templates/nav.hbs
+++ /dev/null
@@ -1,63 +0,0 @@
-<nav class="nav nav--main">
-  <ul>
-    <li>
-      {{#link-to "component-tree" class="nav__item"}}
-        {{svg-jar "nav-components" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Components</span>
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "route-tree" class="nav__item"}}
-        {{svg-jar "nav-route-tree" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Routes</span>
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "data" class="nav__item"}}
-        {{svg-jar "nav-data" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Data</span>
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "deprecations" class="nav__item"}}
-        {{svg-jar "nav-deprecations" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Deprecations</span>
-        <span class="pill">{{deprecationCount}}</span>
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "info" class="nav__item"}}
-        {{svg-jar "nav-info" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Info</span>
-      {{/link-to}}
-    </li>
-  </ul>
-
-  <h1 class="nav__title">Advanced</h1>
-
-  <ul>
-    <li>
-      {{#link-to "promise-tree" class="nav__item"}}
-        {{svg-jar "nav-promises" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Promises</span>
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "container-types" class="nav__item"}}
-        {{svg-jar "nav-container" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">Container</span>
-      {{/link-to}}
-    </li>
-    <li>
-      {{#link-to "render-tree" class="nav__item"}}
-        {{svg-jar
-          "nav-render-performance"
-          width="20px"
-          height="20px"
-          class="nav__item-icon"
-        }}
-        <span class="nav__item-label">Render Performance</span>
-      {{/link-to}}
-    </li>
-  </ul>
-</nav>