diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index b517edab..ce230a16 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -59,7 +59,7 @@ sub jobsetIndex {
 	    , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1 and b.buildStatus = 0))" 
 	    ]
         , '+as' => [ "nrBuilds", "nrScheduled", "nrFinished", "nrSucceeded" ]
-        , rows => 5
+        , rows => 6
         }
     ) ];
 
diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index 76882997..28f1330c 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -18,7 +18,7 @@ sub begin :Private {
     $c->stash->{version} = $ENV{"HYDRA_RELEASE"} || "<devel>";
     $c->stash->{nixVersion} = $ENV{"NIX_RELEASE"} || "<devel>";
     $c->stash->{curTime} = time;
-    $c->stash->{logo} = $ENV{"HYDRA_LOGO"} ? "/logo" : "/static/images/nixos-logo-only-hires.png" ;
+    $c->stash->{logo} = $ENV{"HYDRA_LOGO"} ? "/logo" : "";
     $c->stash->{tracker} = $ENV{"HYDRA_TRACKER"} ;
 
     if (scalar(@args) == 0 || $args[0] ne "static") {
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 62724393..ac94d41f 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -90,14 +90,15 @@
 			});
 		</script>
 	    [% END %]
-	    
-	    	<h2>Most recent evaluations</h2>
-	    	[% INCLUDE renderEvals nrShown=5 %]
+	    	
+		[% IF !edit-%]
+                    <h2>Most recent evaluations</h2>
+	            [% INCLUDE renderEvals nrShown=5 %]
    
-                <a href="c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name])" class="btn">All evaluations</a>
-                <br />
-                <br />
-	
+                    <a href="[% c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]" class="btn">All evaluations</a>
+                    <br />
+                    <br />
+                [% END %]
 		[% IF !edit && activeJobsStatus -%]
 		    <h2>Status</h2>
 		    <table class="table table-striped table-condensed">
diff --git a/src/root/layout.tt b/src/root/layout.tt
index abde5b74..2247dcca 100644
--- a/src/root/layout.tt
+++ b/src/root/layout.tt
@@ -90,7 +90,13 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a class="brand" href="[% c.uri_for(c.controller('Root').action_for('index')) %]"><img src="[% logo %]" alt="Hydra Logo" class="logo" /></a>
+          <a class="brand" href="[% c.uri_for(c.controller('Root').action_for('index')) %]">
+          [% IF logo == "" %]
+              Hydra
+          [% ELSE %]
+              <img src="[% logo %]" alt="Hydra Logo" class="logo" />
+          [% END %]
+          </a>
           <div class="nav-collapse">
             [% PROCESS topbar.tt %]
           </div><!--/.nav-collapse -->
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index f75eb4b8..a3ecd7ad 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -12,3 +12,7 @@ th {
     text-align: left;
     vertical-align: top;
 }
+
+.template {
+    display: none;
+}
\ No newline at end of file