diff --git a/doc/en-US/user_guide_pypi.md b/doc/en-US/user_guide_pypi.md
index 8f6906c6..b9ea7a2a 100644
--- a/doc/en-US/user_guide_pypi.md
+++ b/doc/en-US/user_guide_pypi.md
@@ -424,7 +424,7 @@ The following argument options are currently available:
    -h, --help           show this help message and exit
   --conf CONF           Path of config file. default:-
                         "~/.securetea/securetea.conf"
-  --debug               Degug true or false
+  --debug               Debug true or false
   --twitter             Setup twitter credentials
   --twilio_sms          Setup twilio SMS credentials
   --whatsapp						Setup whatsapp credentials
diff --git a/gui/src/app/header/header.component.html b/gui/src/app/header/header.component.html
index 3c08f876..6d6c274e 100644
--- a/gui/src/app/header/header.component.html
+++ b/gui/src/app/header/header.component.html
@@ -2,22 +2,24 @@
 <link href="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css" rel="stylesheet" />
 
 <nav class="navbar top-navbar navbar-expand-md navbar-light">
-    <div class="navbar-header">
-        <a class="navbar-brand" href="/dashboard">
-            <b><img src="../assets/images/logo.png" alt="homepage" class="dark-logo" /></b>
-            <span><img src="../assets/images/logo-text.png" alt="homepage" class="dark-logo" /></span>
-        </a>
-    </div>
-    <div class="navbar-collapse">
-        <ul class="navbar-nav mr-auto mt-md-0">
-        </ul>
-        <ul class="navbar-nav my-lg-0">
-            <li class="nav-item dropdown ">
-                <div class="username">{{ username | titlecase}}</div>
-            </li>
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle text-muted" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="../../assets/images/users/5.jpg" alt="user" class="profile-pic" /></a>
-            </li>
-        </ul>
+    <div style="display: flex;">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="/dashboard">
+                <b><img src="../assets/images/logo.png" alt="homepage" class="dark-logo" /></b>
+                <span><img src="../assets/images/logo-text.png" alt="homepage" class="dark-logo" /></span>
+            </a>
+        </div>
+        <div class="navbar-collapse" style="margin-left:auto!important; margin-right:0!important;">
+            <ul class="navbar-nav my-lg-0">
+                <li class="nav-item dropdown ">
+                    <div class="username">{{ username | titlecase}}</div>
+                </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle text-muted" data-toggle="dropdown" aria-haspopup="true"
+                        aria-expanded="false"><img src="../../assets/images/users/5.png" alt="user"
+                            class="profile-pic" /></a>
+                </li>
+            </ul>
+        </div>
     </div>
 </nav>
\ No newline at end of file
diff --git a/gui/src/app/register/register.component.html b/gui/src/app/register/register.component.html
index 7761613f..0d34470a 100644
--- a/gui/src/app/register/register.component.html
+++ b/gui/src/app/register/register.component.html
@@ -21,6 +21,7 @@ <h1 class="ml-4">Register</h1>
 									<input formControlName="endpoint" class="form-control" placeholder="http://192.168.1.123:5000" required>
 								</div>
 								<h5 class="text-danger">{{error}}</h5>
+								<h4>Already registered? <a href="/config">Login here</a> </h4>
                 				<button type="submit" class="btn btn-primary btn-flat m-b-30">Register</button>
 							</form>
                       	</div>
diff --git a/gui/src/assets/images/users/5.png b/gui/src/assets/images/users/5.png
new file mode 100644
index 00000000..23fb5559
Binary files /dev/null and b/gui/src/assets/images/users/5.png differ
diff --git a/securetea/entry_points/iot_ep.py b/securetea/entry_points/iot_ep.py
index 630fb3c6..6600c985 100644
--- a/securetea/entry_points/iot_ep.py
+++ b/securetea/entry_points/iot_ep.py
@@ -41,7 +41,7 @@ def get_args():
         '--debug',
         default=False,
         action="store_true",
-        help='Degug true or false'
+        help='Debug true or false'
     )
 
     return parser.parse_args()
diff --git a/securetea/entry_points/server_ep.py b/securetea/entry_points/server_ep.py
index 74c03579..442621fb 100644
--- a/securetea/entry_points/server_ep.py
+++ b/securetea/entry_points/server_ep.py
@@ -37,7 +37,7 @@ def get_args():
         '--debug',
         default=False,
         action="store_true",
-        help='Degug true or false'
+        help='Debug true or false'
     )
 
     return parser.parse_args()
diff --git a/securetea/entry_points/system_ep.py b/securetea/entry_points/system_ep.py
index 5f9d177c..0ff16ff1 100644
--- a/securetea/entry_points/system_ep.py
+++ b/securetea/entry_points/system_ep.py
@@ -41,7 +41,7 @@ def get_args():
         '--debug',
         default=False,
         action="store_true",
-        help='Degug true or false'
+        help='Debug true or false'
     )
 
     args = parser.parse_args()