diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index 3c2c24d6..e4cad606 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -1,15 +1,16 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
 
-    <link href="${rootURL}/plugin/build-pipeline-plugin/css/main.css" type="text/css" rel="stylesheet" />
+    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/redmond/jquery-ui-1.8.14.custom.css"></link>
+    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/jquery.fancybox-1.3.4.css"></link>
+    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/jquery.tooltip.css"></link>
+    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/main.css" type="text/css" />
 
     <!-- If the user specifies a custom CSS link, load it.-->
     <j:if test="${!empty(from.cssUrl)}">
-        <link href="${from.cssUrl}" type="text/css" rel="stylesheet" />
+        <link rel="stylesheet" href="${from.cssUrl}" type="text/css" />
     </j:if>
 
-    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/redmond/jquery-ui-1.8.14.custom.css"></link>
-    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/jquery.fancybox-1.3.4.css"></link>
-    <link rel="stylesheet" href="${rootURL}/plugin/build-pipeline-plugin/css/jquery.tooltip.css"></link>
+
     <script src="${rootURL}/plugin/build-pipeline-plugin/js/jquery-migrate-1.2.1.min.js"></script>
     <script type="text/javascript" src="${rootURL}/plugin/build-pipeline-plugin/js/jquery-ui-1.8.14.custom.min.js"></script>
     <script type="text/javascript" src="${rootURL}/plugin/build-pipeline-plugin/js/handlebars-1.0.0.beta.6.js"></script>
@@ -39,6 +40,7 @@
         {{else}}
         <div class="build-time">N/A</div>
         {{/if}}
+
         {{#if build.isComplete}}
         <div class="build-duration" title="Build duration: {{build.duration}}">{{build.duration}}</div>
         {{else}}
@@ -48,6 +50,7 @@
         {{#if build.isBuilding}}
         <div class="build-duration" title="Build duration: {{build.duration}}">{{build.duration}}</div>
         {{/if}}
+
         {{#if build.userId}}
         <div class="build-user" title="User: {{build.userId}}">{{build.userId}}</div>
         {{/if}}
@@ -158,28 +161,21 @@
     <div class="header">
         <a href="${rootURL}/{{url}}" title="{{name}}">{{name}}</a>
     </div>
-    <div>
-        <ul>
-            <li>Health: <img src="${rootURL}/images/16x16/{{health}}" /></li>
-            <j:if test="${from.isShowPipelineParametersInHeaders()}">
-                {{#if lastSuccessfulBuildNumber}}
-                <li>Execution: <a href="${rootURL}/{{url}}{{lastSuccessfulBuildNumber}}">
-                #{{lastSuccessfulBuildNumber}}</a></li>
-                {{/if}}
-            </j:if>
-        </ul>
-        <j:if test="${from.isShowPipelineParametersInHeaders()}">
+    <j:if test="${from.isShowPipelineParametersInHeaders()}">
+        <div class="build-info">
             {{#if lastSuccessfulBuildNumber}}
-                <ul>
+            <ul>
+                <li>Health: <img src="${rootURL}/images/16x16/{{health}}" /></li>
+                <li>Build <abbr title="Number">No.</abbr>: <a href="${rootURL}/{{url}}{{lastSuccessfulBuildNumber}}">#{{lastSuccessfulBuildNumber}}</a></li>
                 {{#each lastSuccessfulBuildParams}}
                     <li>{{paramName}}: {{paramValue}}</li>
                 {{/each}}
-                </ul>
+            </ul>
             {{else}}
-                <span>Awaiting Execution</span>
+                Awaiting Execution
             {{/if}}
-        </j:if>
-    </div>
+        </div>
+    </j:if>
 </div>
 </script>
 
@@ -331,7 +327,7 @@
                     <div class="revision rounded">
                     <j:choose>
                         <j:when test="${from.isShowPipelineParameters()}">
-                            <div class="title">Pipeline ${buildGrid.get(x,0).getRevision()}</div>
+                            <div class="title">Pipeline ${buildGrid.get(0,0).getRevision()}</div>
                         </j:when>
                         <j:otherwise>
                             <div class="title">Pipeline</div>
@@ -340,19 +336,23 @@
                     <j:choose>
                         <j:when test="${from.isShowPipelineParameters()}">
                             <j:choose>
-                                <j:when test="${buildGrid.get(x,0).getParameters().isEmpty()}">
+                                <j:when test="${buildGrid.get(0,0).getParameters().isEmpty()}">
                                     <div class="description">No parameters</div>
                                 </j:when>
                                 <j:otherwise>
-                                    <div class="build-parameters" id="build-parameters-${buildGrid.get(x,0).getId()}">
-                                    <j:forEach items="${buildGrid.get(x,0).getParameters().entrySet()}" var="buildParam" indexVar="buildParamCtr">
-                                        ${buildParam.getKey()}: ${buildParam.getValue()}
-                                    </j:forEach>
+                                    <div class="build-parameters" id="build-parameters-${buildGrid.get(0,0).getId()}">
+                                        <ul>
+                                        <j:forEach items="${buildGrid.get(0,0).getParameters().entrySet()}"
+                                        var="buildParam" indexVar="buildParamCtr">
+                                            <li>${buildParam.getKey()}: ${buildParam.getValue()}</li>
+                                        </j:forEach>
+                                        </ul>
                                     </div>
                                     <script>
-                                        jQuery('#build-parameters-trigger-${buildGrid.get(x,0).getId()}').tooltip({
+                                        jQuery('#build-parameters-trigger-${buildGrid.get(0,0).getId()}').tooltip({
                                             bodyHandler: function() {
-                                                return jQuery('#build-parameters-${buildGrid.get(x,0).getId()}').html();
+                                                return jQuery('#build-parameters-${buildGrid.get(0,0).getId()}')
+                                                .html();
                                             }
                                         });
                                     </script>
@@ -360,8 +360,8 @@
                             </j:choose>
                         </j:when>
                         <j:otherwise>
-                            <div class="build-number-pipeline" id="buildNumber${buildGrid.get(x,0).getId()}">
-                                ${buildGrid.get(x,0).getRevision()}
+                            <div class="build-number-pipeline" id="buildNumber${buildGrid.get(0,0).getId()}">
+                                ${buildGrid.get(0,0).getRevision()}
                             </div>
                         </j:otherwise>
                     </j:choose>
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css
index c8ec7784..a458d811 100644
--- a/src/main/webapp/css/main.css
+++ b/src/main/webapp/css/main.css
@@ -41,7 +41,7 @@ div.pipeline-wrapper div.pipeline {
 
 #build-pipeline-plugin-content {
     background-color: rgba(6, 72, 131, 0.0976563);
-    padding: 10px;
+    padding: 10px 10px 60px 10px;
     height: 100%;
 }
 
@@ -144,6 +144,10 @@ div.pipeline-wrapper div.pipeline {
     padding: 4px;
 }
 
+.build-card .build-info {
+    margin-top: 8px;
+}
+
 .build-card .build-info div {
     padding: 0 0 0 20px;
     margin: 0 0 4px 0;
@@ -173,7 +177,6 @@ div.pipeline-wrapper div.pipeline {
     background: rgba(255, 255, 255, 0.7);
     color: #333;
     padding: 4px 6px;
-    margin-bottom: 8px;
     text-align: left;
 }
 
@@ -214,7 +217,7 @@ div.pipeline-wrapper div.pipeline {
 
 .build-card ul {
     margin: 0;
-    padding: 0;
+    padding: 0 0 0 6px;
 }
 
 .build-card ul li {
diff --git a/src/main/webapp/images/clock-small.png b/src/main/webapp/images/clock-small.png
deleted file mode 100644
index a7782c76..00000000
Binary files a/src/main/webapp/images/clock-small.png and /dev/null differ