diff --git a/app/views/index.scala.html b/app/views/index.scala.html
index 7f23946..f7e4ed3 100644
--- a/app/views/index.scala.html
+++ b/app/views/index.scala.html
@@ -15,7 +15,7 @@ <h6>*ICD-10 CM FY 2016</h6>
             <H4>@message</H4>
         </div>
         <div id="btn-add-terms">
-            <a class="btn btn-warning" type="button" href="/">Start Over</a>
+            <a class="btn btn-warning" type="button" href="@routes.Application.index()">Start Over</a>
             @for(term <- addTerms) {
                 <button type="button" class="btn btn-default addon" data-addon="@term">@term</button>
             }
@@ -53,7 +53,7 @@ <H4>@message</H4>
             <tbody>
             @myCodes.codeValues.map { oneCodeValue =>
                 <tr>
-                    <td><a type="button" class="btn btn-success" href="/search?filter=@oneCodeValue.icd10Code" target="_blank">@oneCodeValue.icd10Code</a>
+                    <td><a type="button" class="btn btn-success" href="@routes.Application.search()?filter=@oneCodeValue.icd10Code" target="_blank">@oneCodeValue.icd10Code</a>
                         @if(oneCodeValue.billability == 1) {
                             <button type="button" class="btn btn-success btn-xs disabled">$</button>
                         }
@@ -64,7 +64,7 @@ <H4>@message</H4>
                         @if(oneCodeValue.billability > 0 && oneCodeValue.billableCodes.size() > 0) {
                             <button type="button" class="btn btn-info btn-xs disabled">$-&gt;</button>
                             @oneCodeValue.billableCodes.map { billableCode =>
-                                <a type="button" class="btn btn-warning btn-xs" href="/search?filter=@billableCode">@billableCode</a>
+                                <a type="button" class="btn btn-warning btn-xs" href="@routes.Application.search()?filter=@billableCode">@billableCode</a>
                             }
                         }
 
@@ -72,7 +72,7 @@ <H4>@message</H4>
                         &nbsp;Code Ref:
 
                         @for(foundCode <- oneCodeValue.foundCodes.toSeq) {
-                            <a type="button" class="btn btn-info btn-xs" href="/search?filter=@foundCode">@foundCode</a>
+                            <a type="button" class="btn btn-info btn-xs" href="@routes.Application.search()?filter=@foundCode">@foundCode</a>
                             }
                         }
 
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
index 221295d..94bf29d 100644
--- a/app/views/main.scala.html
+++ b/app/views/main.scala.html
@@ -47,7 +47,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="/">
+                    <a class="navbar-brand" href="@routes.Application.index()">
                         <img src="@routes.Assets.versioned("images/wingu-white.png")" height="20px"/></a>
                 </div>
             </div>
@@ -64,7 +64,7 @@ <h4>The new standard for mobile medical photography.</h4>
                 <br/>&nbsp;
                     <p class="text-muted">&copy;2015 WinguMD, Inc. Palo Alto, California. All rights reserved.
                 <br/>This is a promotional product. Using the ICD-10 CM FY 2016 data set.
-                <br/>This open source product is provided to you under the terms of the <a href="/lic">MIT license.</a></p>
+                <br/>This open source product is provided to you under the terms of the <a href="@routes.Application.lic()">MIT license.</a></p>
             </div>
         </div>
     </body>