diff --git a/src/main/java/com/web/web_assignment/ProjectBean.java b/src/main/java/com/web/web_assignment/ProjectBean.java
index 9a8daef..da9c043 100644
--- a/src/main/java/com/web/web_assignment/ProjectBean.java
+++ b/src/main/java/com/web/web_assignment/ProjectBean.java
@@ -24,7 +24,7 @@ public class ProjectBean implements Serializable {
     private UserInfo userInfo; // User info for the current user
     private String username;
     private String password;
-    private boolean isLoggedIn = false;
+    private Boolean isLoggedIn = false;
     public String projectKeywords = ""; // String to hold project keywords
     public String newKeyword = "";
     public String projectCollaborators = ""; // String to hold project collaborators
@@ -126,7 +126,11 @@ public class ProjectBean implements Serializable {
         try {
             ArrayList<Project> newProject = new ArrayList<>();
             newProject.add(project);
-            projects.set(projectIdx,project);
+            if (projects.isEmpty()) {
+                projects.add(project);
+            } else {
+                projects.set(projectIdx, project);
+            }
             databaseService.saveProjects(username, newProject);
             context.addMessage("saveButton", new FacesMessage(FacesMessage.SEVERITY_INFO, "Submission Succeeded", null));
             loadAllKeywords();
@@ -252,11 +256,7 @@ public class ProjectBean implements Serializable {
         this.newKeyword = newKeyword;
     }
 
-    public boolean isLoggedIn() {
+    public Boolean getIsLoggedIn() {
         return isLoggedIn;
     }
-
-    public void setLoggedIn(boolean loggedIn) {
-        isLoggedIn = loggedIn;
-    }
 }
diff --git a/src/main/webapp/header.xhtml b/src/main/webapp/header.xhtml
index 371c2e2..a7506c5 100644
--- a/src/main/webapp/header.xhtml
+++ b/src/main/webapp/header.xhtml
@@ -20,6 +20,13 @@
                 <li><h:link value="Edit Projects" outcome="edit" rendered="#{not empty projectBean.username}"/></li>
             </ul>
         </nav>
+        <div style="position: absolute; top: 10px; right: 10px;">
+            <h:form>
+                <h:commandButton value="register" action="register" rendered="#{not projectBean.isLoggedIn}"/>
+                <h:commandButton value="login" action="login" rendered="#{not projectBean.isLoggedIn}"/>
+                <h:commandButton value="logout" action="#{projectBean.logout}" rendered="#{projectBean.isLoggedIn}"/>
+            </h:form>
+        </div>
     </header>
 </h:body>
 </html>