diff --git a/server/templates/server/machine_detail.html b/server/templates/server/machine_detail.html
index 0eb9746c..5de7d110 100644
--- a/server/templates/server/machine_detail.html
+++ b/server/templates/server/machine_detail.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block nav %}
-<li><a href="{% url 'bu_dashboard' business_unit.id %}"><i class="fa fa-chevron-left fa-fw"></i> Back</a></li>
+<li><a href="{% url 'group_dashboard' machine_group.id %}"><i class="fa fa-chevron-left fa-fw"></i> Back</a></li>
 <li><a href="{% url 'inventory.views.machine_inventory' machine.id %}"><i class="fa fa-list-alt fa-fw"></i> Application Inventory</a></li>
 {% if user.userprofile.level == 'GA' or user.userprofile.level == 'RW' %}
   {% if CONFIG_INSTALLED %}
@@ -77,7 +77,7 @@ <h2 style="text-align:center">{{ machine.hostname }}</h2>
           <dd>
             {{ machine.machine_model }}
             {{ machine.cpu_type }}
-            {{ machine.cpu_speed}}
+            {{ machine.cpu_speed }}
           </dd>
           <dt>RAM:</dt>
           <dd>{{ machine.memory }}</dd>
@@ -96,11 +96,15 @@ <h2 style="text-align:center">{{ machine.hostname }}</h2>
           </dd>
           {% endif %}
           <dt>Free disk space:</dt>
-          <dd>{{ report.AvailableDiskSpace|humanreadablesize  }} ({{ machine.hd_percent }}% used)</dd>
+          <dd>{{ report.AvailableDiskSpace|humanreadablesize }} ({{ machine.hd_percent }}% used)</dd>
           <dt>Console user:</dt>
           <dd>{{ report.ConsoleUser }}</dd>
           <br>
           <legend><h5 class"text-uppercase">Management Tools</h5></legend>
+          <dt>Business Unit</dt>
+          <dd>{{ business_unit }}</dd>
+          <dt>Machine Group</dt>
+          <dd>{{ machine_group }}</dd>
           {% if machine.sal_version %}
           <dt>Sal Version:</dt>
           <dd>{{ machine.sal_version }}</dd>