diff --git a/src/Client/src/app/app.html b/src/Client/src/app/app.html
index 3ef2ad6..514c9e4 100644
--- a/src/Client/src/app/app.html
+++ b/src/Client/src/app/app.html
@@ -3,16 +3,19 @@
     
   </div>
   <a class="top-bar-logo" routerLink="">
-    <img class="top-bar-logo" style="margin: 0;" src="img/logo-full.png" />
+    <img class="top-bar-logo" style="margin: 0;" src="img/MistoxLogo.png" />
   </a>
-  <div *ngIf="auth.isLoggedIn" class="top-bar-buttons flex-right">
-    <a class="nav-button nav-button-login" routerLink="/account/settings"><span>{{ auth.loggedInUser.userName.toUpperCase() }}</span></a>
-    <a class="nav-button nav-button-login" routerLink="/account/logout"><span>LOGOUT</span></a>
-  </div>
-  <div *ngIf="!auth.isLoggedIn" class="top-bar-buttons flex-right">
-    <a class="nav-button nav-button-login" routerLink="/account/login"><span>LOGIN</span></a>
-    <a class="nav-button nav-button-login" routerLink="/account/register"><span>REGISTER</span></a>
-  </div>
+  @if (auth.isLoggedIn) {
+    <div class="top-bar-buttons flex-right">
+      <a class="nav-button" routerLink="/account/settings"><span>{{ auth.loggedInUser.userName.toUpperCase() }}</span></a>
+      <a class="nav-button" routerLink="/account/logout"><span>LOGOUT</span></a>
+    </div>
+  } @else {
+    <div class="top-bar-buttons flex-right">
+      <a class="nav-button" routerLink="/account/login"><span>LOGIN</span></a>
+      <a class="nav-button" routerLink="/account/register"><span>REGISTER</span></a>
+    </div>
+  }
 </div>
 <div class="content">
   <router-outlet></router-outlet>
@@ -23,9 +26,9 @@
     <a class="nav-button-bottom bottom-bar-padding" routerLink="/privacy">PRIVACY</a>
     <a class="nav-button-bottom bottom-bar-padding" routerLink="/about">ABOUT</a>
   </div>
-  <a class="bottom-bar-logo" href="https://mistox.com">
-    <img src="img/mistox-logo.png" />
-  </a>
+  <div class="bottom-bar-logo">
+
+  </div>
   <div class="bottom-bar-buttons flex-right bottom-bar-float">
     <div class="bottom-bar-padding">
       <span>Mistox LLC</span>
diff --git a/src/Client/src/app/pages/account/forgotpassword/forgotpassword.component.html b/src/Client/src/app/pages/account/forgotpassword/forgotpassword.component.html
index ed2701b..134e496 100644
--- a/src/Client/src/app/pages/account/forgotpassword/forgotpassword.component.html
+++ b/src/Client/src/app/pages/account/forgotpassword/forgotpassword.component.html
@@ -16,8 +16,13 @@
       </div>
     </div>
 
-    <ul *ngIf="errorMsgs.length > 0" >
-      <li *ngFor="let msg of errorMsgs" >{{ msg }}</li>
-    </ul>
+    @if(errorMsgs.length > 0){
+      <ul>
+        @for(msg of errorMsgs; track msg.length ){
+          <li>{{ msg }}</li>
+        }
+      </ul>
+    }
+    
   </form>
 </div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/account/login/login.component.html b/src/Client/src/app/pages/account/login/login.component.html
index 7b330cb..ee23245 100644
--- a/src/Client/src/app/pages/account/login/login.component.html
+++ b/src/Client/src/app/pages/account/login/login.component.html
@@ -28,8 +28,13 @@
       </div>
     </div>
 
-    <ul *ngIf="errorMsgs.length > 0" >
-      <li *ngFor="let msg of errorMsgs" >{{ msg }}</li>
-    </ul>
+    @if(errorMsgs.length > 0){
+      <ul>
+        @for(msg of errorMsgs; track msg.length ){
+          <li>{{ msg }}</li>
+        }
+      </ul>
+    }
+    
   </form>
 </div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/account/register/register.component.html b/src/Client/src/app/pages/account/register/register.component.html
index e4a6914..443978d 100644
--- a/src/Client/src/app/pages/account/register/register.component.html
+++ b/src/Client/src/app/pages/account/register/register.component.html
@@ -28,8 +28,13 @@
             </div>
         </div>
 
-        <ul *ngIf="errorMsgs.length > 0" >
-            <li *ngFor="let msg of errorMsgs" >{{ msg }}</li>
+        @if(errorMsgs.length > 0){
+        <ul>
+            @for(msg of errorMsgs; track msg.length ){
+            <li>{{ msg }}</li>
+            }
         </ul>
+        }
+    
     </form>
 </div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/account/resetpassword/resetpassword.component.html b/src/Client/src/app/pages/account/resetpassword/resetpassword.component.html
index 1ad09af..ef23741 100644
--- a/src/Client/src/app/pages/account/resetpassword/resetpassword.component.html
+++ b/src/Client/src/app/pages/account/resetpassword/resetpassword.component.html
@@ -22,8 +22,13 @@
       </div>
     </div>
 
-    <ul *ngIf="errorMsgs.length > 0" >
-      <li *ngFor="let msg of errorMsgs" >{{ msg }}</li>
-    </ul>
+    @if(errorMsgs.length > 0){
+      <ul>
+        @for(msg of errorMsgs; track msg.length ){
+          <li>{{ msg }}</li>
+        }
+      </ul>
+    }
+    
   </form>
 </div>
\ No newline at end of file