diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index a16cea9e..bb6a47ce 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -339,27 +339,30 @@ sub getDependencyGraph {
 }
 
 
-sub deps : Chained('build') PathPart('deps') {
+sub build_deps : Chained('build') PathPart('build-deps') {
     my ($self, $c) = @_;
-
     my $build = $c->stash->{build};
     my $drvPath = $build->drvpath;
+
+    error($c, "Derivation no longer available.") unless isValidPath $drvPath;
+
+    $c->stash->{buildTimeGraph} = getDependencyGraph($self, $c, 0, {}, $drvPath);
+
+    $c->stash->{template} = 'build-deps.tt';
+}
+
+
+sub runtime_deps : Chained('build') PathPart('runtime-deps') {
+    my ($self, $c) = @_;
+    my $build = $c->stash->{build};
     my @outPaths = map { $_->path } $build->buildoutputs->all;
 
-    $c->stash->{available} = all { isValidPath($_) } @outPaths;
-    $c->stash->{drvAvailable} = isValidPath $drvPath;
+    error($c, "Build outputs no longer available.") unless all { isValidPath($_) } @outPaths;
 
-    if ($c->stash->{available}) {
-        my $done = {};
-        $c->stash->{runtimeGraph} = [ map { getDependencyGraph($self, $c, 1, $done, $_) } @outPaths ];
-    }
+    my $done = {};
+    $c->stash->{runtimeGraph} = [ map { getDependencyGraph($self, $c, 1, $done, $_) } @outPaths ];
 
-    if ($c->stash->{drvAvailable}) {
-        my $done = {};
-        $c->stash->{buildTimeGraph} = getDependencyGraph($self, $c, 0, $done, $drvPath);
-    }
-
-    $c->stash->{template} = 'deps.tt';
+    $c->stash->{template} = 'runtime-deps.tt';
 }
 
 
diff --git a/src/root/build-deps.tt b/src/root/build-deps.tt
new file mode 100644
index 00000000..5aa4bd1e
--- /dev/null
+++ b/src/root/build-deps.tt
@@ -0,0 +1,7 @@
+[% PROCESS deps.tt %]
+
+<div class="dep-tree">
+  <ul class="tree">
+    [% INCLUDE renderNode node=buildTimeGraph %]
+  </ul>
+</div>
diff --git a/src/root/build.tt b/src/root/build.tt
index 4c8ceba5..eff48106 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -70,6 +70,8 @@
   [% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
   [% IF build.dependents %]<li><a href="#tabs-usedby" data-toggle="tab">Used by</a></li>[% END%]
   [% IF prevBuilds %]<li><a href="#tabs-history" data-toggle="tab">History chart</a></li>[% END %]
+  [% IF drvAvailable %]<li><a href="#tabs-build-deps" data-toggle="tab">Build dependencies</a></li>[% END %]
+  [% IF available %]<li><a href="#tabs-runtime-deps" data-toggle="tab">Runtime dependencies</a></li>[% END %]
 </ul>
 
 <div id="generic-tabs" class="tab-content">
@@ -101,7 +103,7 @@
                 <td><tt>[% HTML.escape(build.releasename) %]</tt></td>
               </tr>
             [% ELSE %]
-              <tr>
+g              <tr>
                 <th>Nix name:</th>
                 <td><tt>[% build.nixname %]</tt></td>
               </tr>
@@ -249,11 +251,11 @@
       </tr>
       <tr>
         <th>Derivation store path:</th>
-        <td><tt>[% build.drvpath %]</tt>[% IF drvAvailable %] (<a href="[% c.uri_for('/build' build.id 'deps') %]#buildtime">build-time dependencies</a>)[% END %]</td>
+        <td><tt>[% build.drvpath %]</tt></td>
       </tr>
       <tr>
         <th>Output store paths:</th>
-        <td><tt>[% INCLUDE renderOutputs outputs=build.buildoutputs %]</tt> [% IF available %](<a href="[% c.uri_for('/build' build.id 'deps') %]#runtime">runtime dependencies</a>)[% END %]</td>
+        <td><tt>[% INCLUDE renderOutputs outputs=build.buildoutputs %]</tt></td>
       </tr>
       <tr>
         <th>Time added:</th>
@@ -344,8 +346,6 @@
   [% IF build.dependents %]
     <div id="tabs-usedby" class="tab-pane">
 
-      <h2>Used by</h2>
-
       <p>The following builds have used this build as an input:</p>
 
       <table class="tablesorter table table-condensed table-striped">
@@ -368,7 +368,8 @@
 
   [% IF prevBuilds %]
     <div id="tabs-history" class="tab-pane">
-      <h2>Build time history (in seconds)</h2>
+      <h3>Build time history (in seconds)</h3>
+
       <div id="placeholder" style="width:800px;height:400px;"></div>
       <div id="overview" style="margin-left:50px;margin-top:20px;width:600px;height:50px"></div>
 
@@ -436,9 +437,11 @@
         });
       </script>
 
-      <h2>Store path size history (in MB)</h2>
+      <h3>Store path size history (in MB)</h3>
+
       <div id="placeholder-size" style="width:800px;height:400px;"></div>
       <div id="overview-size" style="margin-left:50px;margin-top:20px;width:600px;height:50px"></div>
+
       <script type="text/javascript">
         $(function() {
           var d = [];
@@ -503,7 +506,20 @@
     </div>
   [% END %]
 
+  [% IF drvAvailable %]
+    <div id="tabs-build-deps" class="tab-pane"><i class="icon-time icon-black"></i></div>
+    <script>
+      $('#tabs-build-deps').load("[% c.uri_for('/build' build.id 'build-deps') %]");
+    </script>
+  [% END %]
+
+  [% IF available %]
+    <div id="tabs-runtime-deps" class="tab-pane"><i class="icon-time icon-black"></i></div>
+    <script>
+      $('#tabs-runtime-deps').load("[% c.uri_for('/build' build.id 'runtime-deps') %]");
+    </script>
+  [% END %]
+
 </div>
 
 [% END %]
-
diff --git a/src/root/deps.tt b/src/root/deps.tt
index f20949d9..cf8f0fdb 100644
--- a/src/root/deps.tt
+++ b/src/root/deps.tt
@@ -1,11 +1,6 @@
-[% WRAPPER layout.tt title="Dependencies of build $id" %]
 [% PROCESS common.tt %]
-[% USE HTML %]
 
-[% project = build.project;
-   jobset = build.jobset;
-   job = build.job;
-   global.nodeId = 1 %]
+[% global.nodeId = 1 %]
 
 [% BLOCK renderNode %]
   <li>
@@ -34,28 +29,3 @@
     [% END %]
   </li>
 [% END %]
-
-<section><h2 id="runtime">Runtime dependency graph</h2>
-[% IF available %]
-<ul class="tree">
-  [% done={}; FOREACH node IN runtimeGraph; INCLUDE renderNode; END %]
-</ul>
-[% ELSE %]
-<p><em>No longer available.</em></p>
-[% END %]
-</section>
-
-<br />
-
-<section><h2 id="buildtime">Build-time dependency graph</h2>
-[% IF drvAvailable %]
-<ul class="tree">
-  [% INCLUDE renderNode node=buildTimeGraph %]
-</ul>
-[% ELSE %]
-<p><em>No longer available.</em></p>
-[% END %]
-</section>
-
-[% END %]
-
diff --git a/src/root/runtime-deps.tt b/src/root/runtime-deps.tt
new file mode 100644
index 00000000..db22b47f
--- /dev/null
+++ b/src/root/runtime-deps.tt
@@ -0,0 +1,7 @@
+[% PROCESS deps.tt %]
+
+<div class="dep-tree">
+  <ul class="tree">
+    [% FOREACH node IN runtimeGraph; INCLUDE renderNode; END %]
+  </ul>
+</div>
\ No newline at end of file
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index 20f767f3..c8ba7640 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -30,7 +30,7 @@ span:target > span.dep-tree-line {
 }
 
 :target {
-  padding-top: 40px;
-  margin-top: -40px;
-  display: inline-block; /* required for webkit browsers */
+    padding-top: 40px;
+    margin-top: -40px;
+    display: inline-block; /* required for webkit browsers */
 }