diff --git a/README.md b/README.md
index 349f05a7..ca79bb8f 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,12 @@
 [![License](https://img.shields.io/packagist/l/corpsee/php-censor.svg?label=License&style=flat-square)](https://packagist.org/packages/corpsee/php-censor)
 [![SensioLabs Insight](https://img.shields.io/sensiolabs/i/26f28bee-a861-45b2-bc18-ed2ac7defd22.svg?label=Insight&style=flat-square)](https://insight.sensiolabs.com/projects/26f28bee-a861-45b2-bc18-ed2ac7defd22)
 
-PHP Censor
-==========
+<p align="center">
+    <img width="500" height="auto" src="docs/images/php-censor-black.png" alt="PHP Censor" />
+</p>
 
-**PHP Censor** is a open source self-hosted continuous integration server for PHP projects (Fork of 
-[PHPCI](https://www.phptesting.org)).
+**PHP Censor** is a open source self-hosted continuous integration server for PHP projects 
+([PHPCI](https://www.phptesting.org) fork).
 
 [![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png)
 
diff --git a/docs/images/php-censor-black.png b/docs/images/php-censor-black.png
new file mode 100644
index 00000000..39497cb2
Binary files /dev/null and b/docs/images/php-censor-black.png differ
diff --git a/docs/images/php-censor-black.svg b/docs/images/php-censor-black.svg
new file mode 100644
index 00000000..9dba17a3
--- /dev/null
+++ b/docs/images/php-censor-black.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg4370"
+   viewBox="0 0 727.5 124.50821"
+   height="35.138985mm"
+   width="205.31667mm">
+  <defs
+     id="defs4372" />
+  <metadata
+     id="metadata4375">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-8.3928568,-901.42299)"
+     id="layer1">
+    <path
+       id="path3371"
+       d="m 8.3928568,901.42299 0,124.50821 727.5000032,0 0,-124.50821 -727.5000032,0 z m 13.3761462,13.71941 700.061187,0 0,97.0694 -700.061187,0 0,-97.0694 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3395"
+       d="m 50.23762,929.54834 0,68.60079 13.721283,0 0,-20.92425 41.171357,0 6.50517,-6.21631 0,-34.19723 -6.50517,-7.263 -54.89264,0 z m 13.721283,13.37802 34.641783,0 0,21.26564 -34.641783,0 0,-21.26564 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3409"
+       d="m 120.65173,929.54892 0,68.59972 13.58201,0 0,-27.14007 34.19769,0 0,27.14007 13.33951,0 0,-68.59972 -13.33951,0 0,27.87761 -34.19769,0 0,-27.87761 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3395-6"
+       d="m 191.61467,929.55397 0,68.59891 13.72128,0 0,-20.92237 41.17135,0 6.50519,-6.21632 0,-34.1991 -6.50519,-7.26112 -54.89263,0 z m 13.72128,13.37614 34.64179,0 0,21.26752 -34.64179,0 0,-21.26752 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3456"
+       d="m 342.64439,950.30033 0,-13.48942 -6.68839,-7.26199 -47.67685,0 -6.51696,7.26199 0,54.64925 6.51696,6.68848 47.67685,0 6.68839,-6.68848 0,-14.23443 -13.20545,0 0,7.54596 -34.12834,0 0,-41.84583 34.12834,0 0,7.37447 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3485"
+       d="m 409.52915,942.92586 0,-13.37694 -57.79529,0 0,68.59972 57.79529,0 0,-13.37695 -44.24679,0 0,-13.76312 40.47119,0 0,-13.58204 -40.47119,0 0,-14.50067 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3501"
+       d="m 418.36547,929.54892 13.70331,0 34.07639,44.49136 0,-44.49136 13.70332,0 0,68.59972 -13.70332,0 -34.07639,-44.2389 0,44.2389 -13.70331,0 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3515"
+       d="m 550.54785,950.30033 0,-13.48942 -6.79096,-7.26199 -47.7797,0 -6.66976,7.26199 0,27.38087 6.66976,6.81679 41.35244,0 0,13.76312 -34.68268,0 0,-7.54596 -13.33952,0 0,14.23443 6.66976,6.68848 47.7797,0 6.79096,-6.68848 0,-27.26838 -6.79096,-6.76525 -41.10994,0 0,-14.50067 34.68268,0 0,7.37447 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3529"
+       d="m 567.28333,929.54834 -6.79217,7.263 0,54.64878 6.79217,6.68901 47.7797,0 6.67026,-6.68901 0,-54.64878 -6.67026,-7.263 -47.7797,0 z m 6.67026,13.37802 34.43919,0 0,41.84476 -34.43919,0 0,-41.84476 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3545"
+       d="m 631.55484,929.54834 0,68.60079 13.46054,0 0,-20.92425 20.61663,0 13.58248,14.23524 0,6.68901 13.58059,0 0,-13.37801 -6.66837,-7.54624 6.66837,-6.21631 0,-34.19723 -6.66837,-7.263 -54.57187,0 z m 13.46054,13.37802 34.19911,0 0,21.26564 -34.19911,0 0,-21.26564 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/docs/images/php-censor-white.svg b/docs/images/php-censor-white.svg
new file mode 100644
index 00000000..0a320509
--- /dev/null
+++ b/docs/images/php-censor-white.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg4370"
+   viewBox="0 0 727.5 124.50821"
+   height="35.138985mm"
+   width="205.31667mm">
+  <defs
+     id="defs4372" />
+  <metadata
+     id="metadata4375">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-8.3928568,-901.42299)"
+     id="layer1">
+    <path
+       id="path3371"
+       d="m 8.3928568,901.42299 0,124.50821 727.5000032,0 0,-124.50821 -727.5000032,0 z m 13.3761462,13.71941 700.061187,0 0,97.0694 -700.061187,0 0,-97.0694 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3395"
+       d="m 50.23762,929.54834 0,68.60079 13.721283,0 0,-20.92425 41.171357,0 6.50517,-6.21631 0,-34.19723 -6.50517,-7.263 -54.89264,0 z m 13.721283,13.37802 34.641783,0 0,21.26564 -34.641783,0 0,-21.26564 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3409"
+       d="m 120.65173,929.54892 0,68.59972 13.58201,0 0,-27.14007 34.19769,0 0,27.14007 13.33951,0 0,-68.59972 -13.33951,0 0,27.87761 -34.19769,0 0,-27.87761 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3395-6"
+       d="m 191.61467,929.55397 0,68.59891 13.72128,0 0,-20.92237 41.17135,0 6.50519,-6.21632 0,-34.1991 -6.50519,-7.26112 -54.89263,0 z m 13.72128,13.37614 34.64179,0 0,21.26752 -34.64179,0 0,-21.26752 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3456"
+       d="m 342.64439,950.30033 0,-13.48942 -6.68839,-7.26199 -47.67685,0 -6.51696,7.26199 0,54.64925 6.51696,6.68848 47.67685,0 6.68839,-6.68848 0,-14.23443 -13.20545,0 0,7.54596 -34.12834,0 0,-41.84583 34.12834,0 0,7.37447 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3485"
+       d="m 409.52915,942.92586 0,-13.37694 -57.79529,0 0,68.59972 57.79529,0 0,-13.37695 -44.24679,0 0,-13.76312 40.47119,0 0,-13.58204 -40.47119,0 0,-14.50067 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3501"
+       d="m 418.36547,929.54892 13.70331,0 34.07639,44.49136 0,-44.49136 13.70332,0 0,68.59972 -13.70332,0 -34.07639,-44.2389 0,44.2389 -13.70331,0 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3515"
+       d="m 550.54785,950.30033 0,-13.48942 -6.79096,-7.26199 -47.7797,0 -6.66976,7.26199 0,27.38087 6.66976,6.81679 41.35244,0 0,13.76312 -34.68268,0 0,-7.54596 -13.33952,0 0,14.23443 6.66976,6.68848 47.7797,0 6.79096,-6.68848 0,-27.26838 -6.79096,-6.76525 -41.10994,0 0,-14.50067 34.68268,0 0,7.37447 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3529"
+       d="m 567.28333,929.54834 -6.79217,7.263 0,54.64878 6.79217,6.68901 47.7797,0 6.67026,-6.68901 0,-54.64878 -6.67026,-7.263 -47.7797,0 z m 6.67026,13.37802 34.43919,0 0,41.84476 -34.43919,0 0,-41.84476 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3545"
+       d="m 631.55484,929.54834 0,68.60079 13.46054,0 0,-20.92425 20.61663,0 13.58248,14.23524 0,6.68901 13.58059,0 0,-13.37801 -6.66837,-7.54624 6.66837,-6.21631 0,-34.19723 -6.66837,-7.263 -54.57187,0 z m 13.46054,13.37802 34.19911,0 0,21.26564 -34.19911,0 0,-21.26564 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/public/assets/css/login.css b/public/assets/css/login.css
new file mode 100644
index 00000000..52f474e1
--- /dev/null
+++ b/public/assets/css/login.css
@@ -0,0 +1,42 @@
+html {
+    min-height: 100%;
+}
+
+body
+{
+    background:  #222d32;
+    min-height:  100%;
+    font-style:  normal;
+    font-weight: 300;
+    padding-top: 0;
+}
+
+a {
+    color: #3c8dbc;
+}
+a:hover,
+a:active,
+a:focus {
+    outline: none;
+    text-decoration: none;
+    color: #72afd2;
+}
+
+#logo {
+    margin:     0 auto;
+    padding:    100px 30px 50px 30px;
+    width:      350px;
+    text-align: center;
+    display:    block;
+}
+
+#login-box
+{
+    background:    #fcfcfc;
+    border-radius: 5px;
+    box-shadow:    0 0 30px rgba(0,0,0, 0.3);
+    margin:        0 auto;
+    padding:       15px 30px;
+    text-align:    left;
+    width:         350px;
+}
diff --git a/public/assets/css/main.css b/public/assets/css/main.css
index 92b07137..1fc0d12e 100644
--- a/public/assets/css/main.css
+++ b/public/assets/css/main.css
@@ -1,3 +1,7 @@
+.main-header .logo {
+    padding: 0 30px;
+}
+
 .wrapper,
 .main-sidebar,
 .left-side {
@@ -552,8 +556,7 @@ h6,
 .h3,
 .h4,
 .h5,
-.h6,
-.main-header .logo {
+.h6 {
     font-family: sans-serif;
 }
 
diff --git a/public/assets/img/favicon.png b/public/assets/img/favicon.png
deleted file mode 100644
index 0b6f60ec..00000000
Binary files a/public/assets/img/favicon.png and /dev/null differ
diff --git a/public/assets/img/php-censor-white.svg b/public/assets/img/php-censor-white.svg
new file mode 100644
index 00000000..0a320509
--- /dev/null
+++ b/public/assets/img/php-censor-white.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg4370"
+   viewBox="0 0 727.5 124.50821"
+   height="35.138985mm"
+   width="205.31667mm">
+  <defs
+     id="defs4372" />
+  <metadata
+     id="metadata4375">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-8.3928568,-901.42299)"
+     id="layer1">
+    <path
+       id="path3371"
+       d="m 8.3928568,901.42299 0,124.50821 727.5000032,0 0,-124.50821 -727.5000032,0 z m 13.3761462,13.71941 700.061187,0 0,97.0694 -700.061187,0 0,-97.0694 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3395"
+       d="m 50.23762,929.54834 0,68.60079 13.721283,0 0,-20.92425 41.171357,0 6.50517,-6.21631 0,-34.19723 -6.50517,-7.263 -54.89264,0 z m 13.721283,13.37802 34.641783,0 0,21.26564 -34.641783,0 0,-21.26564 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3409"
+       d="m 120.65173,929.54892 0,68.59972 13.58201,0 0,-27.14007 34.19769,0 0,27.14007 13.33951,0 0,-68.59972 -13.33951,0 0,27.87761 -34.19769,0 0,-27.87761 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3395-6"
+       d="m 191.61467,929.55397 0,68.59891 13.72128,0 0,-20.92237 41.17135,0 6.50519,-6.21632 0,-34.1991 -6.50519,-7.26112 -54.89263,0 z m 13.72128,13.37614 34.64179,0 0,21.26752 -34.64179,0 0,-21.26752 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3456"
+       d="m 342.64439,950.30033 0,-13.48942 -6.68839,-7.26199 -47.67685,0 -6.51696,7.26199 0,54.64925 6.51696,6.68848 47.67685,0 6.68839,-6.68848 0,-14.23443 -13.20545,0 0,7.54596 -34.12834,0 0,-41.84583 34.12834,0 0,7.37447 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3485"
+       d="m 409.52915,942.92586 0,-13.37694 -57.79529,0 0,68.59972 57.79529,0 0,-13.37695 -44.24679,0 0,-13.76312 40.47119,0 0,-13.58204 -40.47119,0 0,-14.50067 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3501"
+       d="m 418.36547,929.54892 13.70331,0 34.07639,44.49136 0,-44.49136 13.70332,0 0,68.59972 -13.70332,0 -34.07639,-44.2389 0,44.2389 -13.70331,0 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3515"
+       d="m 550.54785,950.30033 0,-13.48942 -6.79096,-7.26199 -47.7797,0 -6.66976,7.26199 0,27.38087 6.66976,6.81679 41.35244,0 0,13.76312 -34.68268,0 0,-7.54596 -13.33952,0 0,14.23443 6.66976,6.68848 47.7797,0 6.79096,-6.68848 0,-27.26838 -6.79096,-6.76525 -41.10994,0 0,-14.50067 34.68268,0 0,7.37447 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3529"
+       d="m 567.28333,929.54834 -6.79217,7.263 0,54.64878 6.79217,6.68901 47.7797,0 6.67026,-6.68901 0,-54.64878 -6.67026,-7.263 -47.7797,0 z m 6.67026,13.37802 34.43919,0 0,41.84476 -34.43919,0 0,-41.84476 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3545"
+       d="m 631.55484,929.54834 0,68.60079 13.46054,0 0,-20.92425 20.61663,0 13.58248,14.23524 0,6.68901 13.58059,0 0,-13.37801 -6.66837,-7.54624 6.66837,-6.21631 0,-34.19723 -6.66837,-7.263 -54.57187,0 z m 13.46054,13.37802 34.19911,0 0,21.26564 -34.19911,0 0,-21.26564 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/PHPCensor/View/BuildStatus/view.phtml b/src/PHPCensor/View/BuildStatus/view.phtml
index 078f517b..73460545 100644
--- a/src/PHPCensor/View/BuildStatus/view.phtml
+++ b/src/PHPCensor/View/BuildStatus/view.phtml
@@ -24,14 +24,16 @@
             <nav class="navbar navbar-static-top">
                 <div class="container">
                     <div class="navbar-header">
-                        <a href="<?php print APP_URL; ?>" class="logo" style="background-color: #222d32; text-align: left;">PHP Censor</a>
+                        <a href="<?php print APP_URL; ?>" class="logo" title="PHP Censor" style="background-color: #222D32; width: 170px; padding: 0;">
+                            <img src="<?php print APP_URL; ?>assets/img/php-censor-white.svg" width="170" height="auto" alt="PHP Censor" />
+                        </a>
                     </div>
                 </div>
             </nav>
         </header>
         <div class="content-wrapper">
             <div class="container">
-                <section class="content">
+                <section class="content" style="padding: 15px 0 15px;">
                     <?php if (!empty($latest)): ?>
 
                         <?php
@@ -87,7 +89,7 @@
 
                     <div class="box">
                         <div class="box-header"><h3 class="box-title">Builds</h3></div>
-                        <table class="table table-striped table-bordered">
+                        <table class="table table-hover">
                             <thead>
                             <tr>
                                 <th>ID</th>
diff --git a/src/PHPCensor/View/Session.phtml b/src/PHPCensor/View/Session.phtml
index 3770cb1f..411c2958 100644
--- a/src/PHPCensor/View/Session.phtml
+++ b/src/PHPCensor/View/Session.phtml
@@ -8,59 +8,22 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link href="<?php print APP_URL; ?>assets/vendor/admin-lte/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-    <script src="<?php print APP_URL; ?>assets/vendor/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-    <script src="<?php print APP_URL; ?>assets/vendor/admin-lte/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-
-    <style type="text/css">
-
-        html {
-            min-height: 100%;
-        }
-
-        body
-        {
-            background: #1e282c;
-            min-height: 100%;
-            font-style: normal;
-            font-weight: 300;
-            padding-top: 0px;
-        }
-
-        #login-box
-        {
-            background: #fcfcfc;
-            border-radius: 5px;
-            box-shadow: 0 0 30px rgba(0,0,0, 0.3);
-            margin: 0 auto;
-            padding: 15px 30px;
-            text-align: left;
-            width: 350px;
-        }
-        
-        #logo, #logo:visited, #logo:hover, #logo:active {
-            text-decoration: none;
-            font-size: 45px;
-            line-height: 90px;
-            text-align: center;
-            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-            padding: 0 15px;
-            font-weight: 600;
-            overflow: hidden;
-            color: white;
-        }
-
-    </style>
+    <link href="<?php print APP_URL; ?>assets/css/login.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <div class="container">
-    <div class="row" style="margin-top: 10%; text-align: center">
+    <div class="row">
         <a id="logo" href="/">
-            PHP Censor
+            <img src="<?php print APP_URL; ?>assets/img/php-censor-white.svg" alt="PHP Censor" width="290" height="auto" /><br />
         </a>
         <div class="" id="login-box">
             <?php print $content; ?>
         </div>
     </div>
 </div>
+
+<script src="<?php print APP_URL; ?>assets/vendor/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+<script src="<?php print APP_URL; ?>assets/vendor/admin-lte/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+
 </body>
 </html>
diff --git a/src/PHPCensor/View/Session/forgotPassword.phtml b/src/PHPCensor/View/Session/forgotPassword.phtml
index 1ebdadf0..75e14508 100644
--- a/src/PHPCensor/View/Session/forgotPassword.phtml
+++ b/src/PHPCensor/View/Session/forgotPassword.phtml
@@ -13,7 +13,6 @@
             <?php print $error; ?>
         </div>
     <?php endif; ?>
-
         <div class="">
             <form class="form" action="<?php print APP_URL; ?>session/forgot-password" method="POST">
                 <div class="form-group">
@@ -26,6 +25,4 @@
                 </div>
             </form>
         </div>
-
-
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/src/PHPCensor/View/Session/login.phtml b/src/PHPCensor/View/Session/login.phtml
index e53ab58a..4ff7451d 100644
--- a/src/PHPCensor/View/Session/login.phtml
+++ b/src/PHPCensor/View/Session/login.phtml
@@ -4,6 +4,6 @@
 <?php endif; ?>
 <?php print $form; ?>
 
-<a style="margin-top: -22px; font-size: 0.85em; color: #246" class="pull-right" href="<?php print APP_URL; ?>session/forgot-password">
+<a style="margin-top: -22px;" class="pull-right" href="<?php print APP_URL; ?>session/forgot-password">
     <?php Lang::out('forgotten_password_link'); ?>
-</a>
\ No newline at end of file
+</a>
diff --git a/src/PHPCensor/View/Session/resetPassword.phtml b/src/PHPCensor/View/Session/resetPassword.phtml
index dab61ef0..ee693789 100644
--- a/src/PHPCensor/View/Session/resetPassword.phtml
+++ b/src/PHPCensor/View/Session/resetPassword.phtml
@@ -1,26 +1,23 @@
 <?php use PHPCensor\Helper\Lang; ?>
 <?php if (empty($error)): ?>
-
-        <div class="box-header">
-            <?php Lang::out('reset_enter_password'); ?>
-        </div>
-
-        <div class="box-body">
-            <form class="form" action="<?php print APP_URL; ?>session/reset-password/<?php print $id; ?>/<?php print $key; ?>" method="POST">
-                <div class="form-group">
-                    <label for="password"><?php Lang::out('reset_new_password'); ?></label>
-                    <input type="password" id="password" name="password" class="form-control" required>
-                </div>
-
-                <div class="form-group">
-                    <input class="btn btn-success" type="submit" value="<?php Lang::out('reset_change_password'); ?>">
-                </div>
-            </form>
-        </div>
-    <?php else: ?>
-    <div class="alert alert-danger" style="margin-bottom: 0">
-            <?php print $error; ?>
+    <div class="box-header">
+        <?php Lang::out('reset_enter_password'); ?>
     </div>
-    <?php endif; ?>
 
+    <div class="box-body">
+        <form class="form" action="<?php print APP_URL; ?>session/reset-password/<?php print $id; ?>/<?php print $key; ?>" method="POST">
+            <div class="form-group">
+                <label for="password"><?php Lang::out('reset_new_password'); ?></label>
+                <input type="password" id="password" name="password" class="form-control" required>
+            </div>
 
+            <div class="form-group">
+                <input class="btn btn-success" type="submit" value="<?php Lang::out('reset_change_password'); ?>">
+            </div>
+        </form>
+    </div>
+<?php else: ?>
+<div class="alert alert-danger" style="margin-bottom: 0">
+        <?php print $error; ?>
+</div>
+<?php endif; ?>
diff --git a/src/PHPCensor/View/layout.phtml b/src/PHPCensor/View/layout.phtml
index 29b1dec8..5556256a 100644
--- a/src/PHPCensor/View/layout.phtml
+++ b/src/PHPCensor/View/layout.phtml
@@ -36,78 +36,80 @@
 
 <!-- header logo: style can be found in header.less -->
 <header class="main-header">
-<a href="<?php print APP_URL; ?>" class="logo">PHP Censor</a>
-<!-- Header Navbar: style can be found in header.less -->
-<nav class="navbar navbar-static-top" role="navigation">
-<!-- Sidebar toggle button-->
-<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
-    <span class="sr-only"><?php Lang::out('toggle_navigation'); ?></span>
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-</a>
-<div class="navbar-custom-menu">
-<ul class="nav navbar-nav">
-
-<li class="dropdown messages-menu app-pending">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-        <i class="fa fa-clock-o"></i>
-        <span class="label label-info app-pending-count"></span>
+    <a href="<?php print APP_URL; ?>" class="logo" title="PHP Censor">
+        <img src="<?php print APP_URL; ?>assets/img/php-censor-white.svg" width="170" height="auto" alt="PHP Censor" />
     </a>
-    <ul class="dropdown-menu">
-        <li class="header"><?php Lang::out('n_builds_pending', 0); ?></li>
-        <li>
-            <ul class="menu app-pending-list">
-            </ul>
-        </li>
-    </ul>
-</li>
-
-<li class="dropdown messages-menu app-running">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-        <i class="fa fa-cogs"></i>
-        <span class="label label-warning app-running-count"></span>
+    <!-- Header Navbar: style can be found in header.less -->
+    <nav class="navbar navbar-static-top" role="navigation">
+    <!-- Sidebar toggle button-->
+    <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+        <span class="sr-only"><?php Lang::out('toggle_navigation'); ?></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
     </a>
-    <ul class="dropdown-menu">
-        <li class="header"><?php Lang::out('n_builds_running', 0); ?></li>
-        <li>
-            <ul class="menu app-running-list">
-            </ul>
-        </li>
+    <div class="navbar-custom-menu">
+    <ul class="nav navbar-nav">
+    
+    <li class="dropdown messages-menu app-pending">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="fa fa-clock-o"></i>
+            <span class="label label-info app-pending-count"></span>
+        </a>
+        <ul class="dropdown-menu">
+            <li class="header"><?php Lang::out('n_builds_pending', 0); ?></li>
+            <li>
+                <ul class="menu app-pending-list">
+                </ul>
+            </li>
+        </ul>
+    </li>
+    
+    <li class="dropdown messages-menu app-running">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="fa fa-cogs"></i>
+            <span class="label label-warning app-running-count"></span>
+        </a>
+        <ul class="dropdown-menu">
+            <li class="header"><?php Lang::out('n_builds_running', 0); ?></li>
+            <li>
+                <ul class="menu app-running-list">
+                </ul>
+            </li>
+        </ul>
+    </li>
+    
+    <?php if (!$this->LoginIsDisabled()->check()): ?>
+    <!-- User Account: style can be found in dropdown.less -->
+    <li class="dropdown user user-menu">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="glyphicon glyphicon-user"></i>
+            <span><?php print $this->User()->getName(); ?> <i class="caret"></i></span>
+        </a>
+        <ul class="dropdown-menu">
+            <!-- User image -->
+            <li class="user-header">
+                <img src="https://www.gravatar.com/avatar/<?php print md5($this->User()->getEmail()); ?>?d=mm" class="img-circle" alt="<?php print $this->User()->getName(); ?>" />
+                <p>
+                    <?php print $this->User()->getName(); ?>
+                </p>
+            </li>
+    
+            <!-- Menu Footer-->
+            <li class="user-footer">
+                <div class="pull-left">
+                    <a href="<?php print APP_URL ?>user/profile" class="btn btn-default btn-flat"><?php Lang::out('edit_profile'); ?></a>
+                </div>
+                <div class="pull-right">
+                    <a href="<?php print APP_URL ?>session/logout" class="btn btn-default btn-flat"><?php Lang::out('sign_out'); ?></a>
+                </div>
+            </li>
+        </ul>
+    </li>
+    <?php endif; ?>
     </ul>
-</li>
-
-<?php if (!$this->LoginIsDisabled()->check()): ?>
-<!-- User Account: style can be found in dropdown.less -->
-<li class="dropdown user user-menu">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-        <i class="glyphicon glyphicon-user"></i>
-        <span><?php print $this->User()->getName(); ?> <i class="caret"></i></span>
-    </a>
-    <ul class="dropdown-menu">
-        <!-- User image -->
-        <li class="user-header">
-            <img src="https://www.gravatar.com/avatar/<?php print md5($this->User()->getEmail()); ?>?d=mm" class="img-circle" alt="<?php print $this->User()->getName(); ?>" />
-            <p>
-                <?php print $this->User()->getName(); ?>
-            </p>
-        </li>
-
-        <!-- Menu Footer-->
-        <li class="user-footer">
-            <div class="pull-left">
-                <a href="<?php print APP_URL ?>user/profile" class="btn btn-default btn-flat"><?php Lang::out('edit_profile'); ?></a>
-            </div>
-            <div class="pull-right">
-                <a href="<?php print APP_URL ?>session/logout" class="btn btn-default btn-flat"><?php Lang::out('sign_out'); ?></a>
-            </div>
-        </li>
-    </ul>
-</li>
-<?php endif; ?>
-</ul>
-</div>
-</nav>
+    </div>
+    </nav>
 </header>
     <!-- Left side column. contains the logo and sidebar -->
     <aside class="main-sidebar sidebar-offcanvas">