diff --git a/src/app/app.component.html b/src/app/app.component.html
index d927cfc..b2701c8 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,8 +1,15 @@
-<mat-toolbar class="mat-elevation-z6" color="primary">
-  <div>&nbsp;</div>
+<mat-toolbar class="mat-elevation-z6 flex-toolbar" color="primary">
   
-  <button mat-raised-button color="primary" [routerLink]="['/']">Home</button>
+    <button mat-raised-button color="primary" [routerLink]="['/']">
+    <mat-icon>home</mat-icon> Home</button>
+    <span>esp-iot-flasher</span>
+    <a href="https://github.com/ThingPulse/esp-iot-flasher" target="_blank"><span><mat-icon>share</mat-icon> Github</span></a>
+    
+    
 </mat-toolbar>
 <div class="container">
   <router-outlet></router-outlet>
-</div>
\ No newline at end of file
+</div>
+<footer class="flex-footer">
+    <span>{{getCurrentYear()}} By <a href="https://www.thingpulse.com">ThingPulse</a></span>
+</footer>
\ No newline at end of file
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index f36eab3..f77748e 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,3 +1,9 @@
+
+a, a:visited {
+    color: inherit;
+    text-decoration: none;
+}
+
 .container {
     max-width: 800px;
     margin: 4em auto;
@@ -9,10 +15,22 @@
     flex-direction: column;
     justify-content: center;
 }
-
+.flex-toolbar {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    padding: 16px;
+}
+.flex-footer {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    padding: 16px;
+}
 .flex-container {
     display: flex;
     justify-content: space-around;
     flex-wrap: wrap;
     padding: 16px;
-}
\ No newline at end of file
+}
+
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 19511f7..efae6ea 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -10,6 +10,10 @@ import { Partition } from './shared/utils.service';
 })
 export class AppComponent  {
 
+  getCurrentYear(): number {
+    return new Date().getFullYear();
+  }
+
 }