diff --git a/app/templates/home-pro.hbs b/app/templates/home-pro.hbs
index 3e79b126..995e7d31 100644
--- a/app/templates/home-pro.hbs
+++ b/app/templates/home-pro.hbs
@@ -4,7 +4,7 @@
       <div class="section-text">
         <h1 class="h1--teal">Build apps <br class="br-small"> with confidence</h1>
         <p class="text-big">Focus on writing code. Let Travis CI take care<br class="br-small"> of running your tests and deploying your apps.</p>
-        <a href="https://travis-ci.com/signin" class="hero-button" title="Start your free trial">Start your free trial</a>
+        <a href="https://travis-ci.com/signin" class="hero-button cta-index-page" title="Start your free trial">Start your free trial</a>
       </div>
       <div class="section-image">
         <img src="../images/pro-landing/hero-screen.svg" class="hero-computer" aria-hidden="true">
@@ -66,7 +66,7 @@
   <section class="section--white section--center">
     <div class="inner">
       <h3 class="h3">Supported languages</h3>
-      <p class="text-small">These are just a few of our most popular languages, check out the full list <a href="#">in our docs</a>.</p>
+      <p class="text-small">These are just a few of our most popular languages, check out the full list <a href="http://docs.travis-ci.com/user/languages/" title="Supported languages">in our docs</a>.</p>
       <ul class="list--languages">
         <li><a href="http://docs.travis-ci.com/user/languages/clojure/"><img alt="Clojure logo" src="../images/pro-landing/lang-clojure.svg" class="language-clojure">Clojure</a></li>
         <li><a href="http://docs.travis-ci.com/user/languages/javascript-with-nodejs/"><img alt="NodeJS logo" src="../images/pro-landing/lang-nodejs.svg" class="language-node">Node</a></li>
@@ -85,7 +85,7 @@
   <section class="section--grey section--center">
     <div class="inner">
       <h2 class="h2--teal">Interested in running your <br class="br-small"> private projects with Travis CI?</h2>
-      <a href="https://travis-ci.com/signin" class="landing-button">Start your free trial</a>
+      <a href="https://travis-ci.com/signin" class="landing-button cta-index-bottom">Start your free trial</a>
     </div>
   </section>
 </div>
\ No newline at end of file
diff --git a/app/templates/plans.hbs b/app/templates/plans.hbs
index aecfe808..0da274c4 100644
--- a/app/templates/plans.hbs
+++ b/app/templates/plans.hbs
@@ -2,7 +2,7 @@
   <section class="section--white">
     <div class="inner">
       <header class="section--center">
-        <h1 class="h1--grey">Always free for <a href="#">open source projects</a>!</h1>
+        <h1 class="h1--grey">Always free for <a href="https://travis-ci.org">open source projects</a>!</h1>
         <p class="text-big">Set up your first project in <strong>just one minute</strong>.<br>
           <strong>Your first 100 builds are free!</strong> No credit card required.
         </p>
@@ -37,7 +37,7 @@
             <li>Unlimited collaborators</li>
           </ul>
           <div class="plan-cta">
-            <a href="https://travis-ci.com/signin" class="plan-cta-btn">Start Trial</a>
+            <a href="https://travis-ci.com/signin" class="plan-cta-btn cta-plans-table">Start Trial</a>
           </div>
         </li>
         <li class="plan--teal">
@@ -53,7 +53,7 @@
             <li>Unlimited collaborators</li>
           </ul>
           <div class="plan-cta">
-            <a href="https://travis-ci.com/signin" class="plan-cta-btn">Start Trial</a>
+            <a href="https://travis-ci.com/signin" class="plan-cta-btn cta-plans-table">Start Trial</a>
           </div>
         </li>
         <li class="plan--yellow">
@@ -69,7 +69,7 @@
             <li>Unlimited collaborators</li>
           </ul>
           <div class="plan-cta">
-            <a href="https://travis-ci.com/signin" class="plan-cta-btn">Start Trial</a>
+            <a href="https://travis-ci.com/signin" class="plan-cta-btn cta-plans-table">Start Trial</a>
           </div>
         </li>
       </ul>
@@ -82,7 +82,7 @@
     <div class="inner">
       <div class="section-text">
         <h2 class="h2--teal">Interested in using <br>Travis CI on-site?</h2>
-        <p class="text-big">We offer an <strong>Enterprise plan</strong> for companies who<br> want to keep using the same features of<br> Travis CI with additional on-site security needs.<br><a href="#">Learn more</a> about Travis CI Enterprise.</p>
+        <p class="text-big">We offer an <strong>Enterprise plan</strong> for companies who<br> want to keep using the same features of<br> Travis CI with additional on-site security needs.<br><a href="https://enterprise.travis-ci.com">Learn more</a> about Travis CI Enterprise.</p>
       </div>
       <div class="section-image">
         <img src="../images/pro-landing/enterprise-servers.svg" alt="Travis CI Enterprise" aria-hidden="true">
diff --git a/app/templates/top.hbs b/app/templates/top.hbs
index edd43ef0..1cb3354b 100644
--- a/app/templates/top.hbs
+++ b/app/templates/top.hbs
@@ -1,5 +1,5 @@
 <div class="topbar {{if is-open 'has-autoheight'}} {{if showBroadcasts 'has-autoheight'}}">
-  <h1 id="logo" class="logo">{{#link-to "main"}}Travis{{/link-to}}</h1>
+  <h1 id="logo" class="logo"><a href="/" alt="Travis CI">Travis CI</a></h1>
 
   <div class="navigation-toggle">
     <button type="button" id="tofuburger" class="tofuburger" {{action 'toggleBurgerMenu'}}>Toggle Menu</button>