diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index 778a84926f..0e5c0f9773 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -120,6 +120,7 @@ select { width: auto; }
 .top-air { margin-top: 40px;}
 .progress { margin-bottom: 0px; }
 .lead .badge { font-size: 18px; font-weight: normal; border-radius: 15px; padding: 9px; }
+.lead ol, .lead ul { padding: 10px 0 0 20px; }
 .lead ol > li, .lead ul > li {
     line-height: 35px;
 }
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index a781224ea1..2535f70af8 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -64,7 +64,7 @@
                     <i class="icon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Revision</dt><dd>{{TOASTER_REVISION}}</dd><dt>Mode</dt><dd>{%if MANAGED%}Build{%else%}Analysis{%endif%}</dd></dl>"></i>
                 {% endif %}
             </span>
-            <a class="pull-right manual" target="_blank" href="http://www.yoctoproject.org/documentation/toaster-manual">
+            <a class="pull-right manual" target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
                 <i class="icon-book"></i>
                 Toaster manual
             </a>
diff --git a/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html b/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
index fe56655a13..5bc435d149 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
+++ b/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
@@ -11,17 +11,17 @@
     <!-- Empty - no build module -->
     <div class="page-header top-air">
      <h1>
-       This page only works with the Toaster 'Build' mode
+       This page only works with Toaster in 'Build' mode
      </h1>
     </div>
-    <div class="alert alert-info">
-     <p class="lead">
-     The 'Build' mode allows you to configure and run your Yocto Project builds from Toaster
+    <div class="alert alert-info lead">
+     <p">
+     The 'Build' mode allows you to configure and run your Yocto Project builds from Toaster.
      <ul>
-       <li class="lead"><a href="https://wiki.yoctoproject.org/wiki/Toaster#Modes">
+       <li><a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#intro-modes">
        Read about the 'Build' mode
        </a></li>
-       <li class="lead"><a href="/">
+       <li><a href="/">
        View your builds
        </a></li>
      </ul>