diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index 0f538b9ffb..65c0919bc9 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -299,7 +299,7 @@ vim: expandtab tabstop=2
         <a href="{% url 'importlayer' %}">Import layer</a></p>
       <ul class="unstyled configuration-list">
           <li ng-repeat="l in layers track by l.id" class="animate-repeat">
-            <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a>
+            <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip-placement="right" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a>
             <i class="icon-trash" ng-click="layerDel(l.id)" tooltip="Delete"></i>
                       </li>
       </ul>
@@ -434,7 +434,7 @@ angular.element(document).ready(function() {
   scope.urls.xhr_edit = "{% url 'xhr_projectedit' project.id %}";
   scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' %}";
   scope.urls.layers = "{% url 'layers' %}";
-  scope.urls.targets = "{% url 'targets' %}";
+  scope.urls.targets = "{% url 'all-targets' %}";
   scope.urls.importlayer = "{% url 'importlayer'%}";
   scope.urls.layer = "{% url 'base_layerdetails' %}";
   scope.project = {{prj|json}};
diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html
index f918d6cff2..27ff2be928 100644
--- a/bitbake/lib/toaster/toastergui/templates/targets.html
+++ b/bitbake/lib/toaster/toastergui/templates/targets.html
@@ -38,7 +38,7 @@
   {% else %}
     <div class="alert alert-info">
       <p class="lead">
-       Toaster has not target information. To generate target information you can:<br/>
+       Toaster has no target information. To generate target information you can:<br/>
        <ul class="lead">
        <li style="margin-top: 10px"> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a></li>
        <li style="margin-top: 10px">  <a href="{% url 'importlayer' %}">Import a layer</a></li>