diff --git a/frontend/src/Pages/AdminPages/AdminAddProject.tsx b/frontend/src/Pages/AdminPages/AdminAddProject.tsx
index 6df8851..aedbd3f 100644
--- a/frontend/src/Pages/AdminPages/AdminAddProject.tsx
+++ b/frontend/src/Pages/AdminPages/AdminAddProject.tsx
@@ -11,6 +11,6 @@ function AdminAddProject(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminAddProject;
diff --git a/frontend/src/Pages/AdminPages/AdminAddUser.tsx b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
index c736e4d..4af2eb7 100644
--- a/frontend/src/Pages/AdminPages/AdminAddUser.tsx
+++ b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
@@ -15,6 +15,6 @@ function AdminAddUser(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminAddUser;
diff --git a/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx b/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
index 2e03a8c..1756433 100644
--- a/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
+++ b/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
@@ -23,6 +23,6 @@ function AdminChangeUsername(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminChangeUsername;
diff --git a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
index c5cba2e..177f55b 100644
--- a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
@@ -21,6 +21,6 @@ function AdminManageProjects(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminManageProjects;
diff --git a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
index e62a54c..0939d77 100644
--- a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
@@ -36,6 +36,6 @@ function AdminManageUsers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminManageUsers;
diff --git a/frontend/src/Pages/AdminPages/AdminMenuPage.tsx b/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
index a8da80e..ed2118d 100644
--- a/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
+++ b/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
@@ -22,6 +22,6 @@ function AdminMenuPage(): JSX.Element {
 
   const buttons = <></>;
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminMenuPage;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
index 63fdb4b..96167cb 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
@@ -23,6 +23,6 @@ function AdminProjectAddMember(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectAddMember;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx b/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
index dd80fa9..dd355e8 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
@@ -23,6 +23,6 @@ function AdminProjectChangeUserRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectChangeUserRole;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx b/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
index 717e8c5..c89e4c4 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
@@ -23,6 +23,6 @@ function AdminProjectManageMembers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectManageMembers;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
index 0b15aeb..a1266ad 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
@@ -23,6 +23,6 @@ function AdminProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectPage;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx b/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
index a5d9f95..dbf3428 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
@@ -16,6 +16,6 @@ function AdminProjectStatistics(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectStatistics;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx b/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
index e15ef35..1c9f28c 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
@@ -23,6 +23,6 @@ function AdminProjectViewMemberInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectViewMemberInfo;
diff --git a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
index a5c3b2b..fc678e2 100644
--- a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
+++ b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
@@ -23,6 +23,6 @@ function AdminViewUserInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminViewUserInfo;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
index 606e474..9f233a1 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
@@ -18,6 +18,6 @@ function ChangeRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default ChangeRole;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
index 19ebbd9..c76947b 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
@@ -10,6 +10,6 @@ function PMOtherUsersTR(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMOtherUsersTR;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index bbafd6a..9fe96cf 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -30,6 +30,6 @@ function PMProjectMembers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMProjectMembers;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index 8e724f3..bd4e6ef 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -31,6 +31,6 @@ function PMProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={undefined} />;
+  return <BasicWindow content={content} buttons={undefined} />;
 }
 export default PMProjectPage;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
index 35ed6ac..676ea28 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
@@ -1,5 +1,5 @@
+import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 import TimeReport from "../../Components/NewWeeklyReport";
 
 function PMTotalTimeActivity(): JSX.Element {
@@ -18,6 +18,6 @@ function PMTotalTimeActivity(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMTotalTimeActivity;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
index 05d902f..c0161f8 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
@@ -10,6 +10,6 @@ function PMTotalTimeRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMTotalTimeRole;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
index fae3842..713efec 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
@@ -10,6 +10,6 @@ function PMUnsignedReports(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMUnsignedReports;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
index 9ca963c..aea25fb 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
@@ -1,3 +1,4 @@
+import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import TimeReport from "../../Components/NewWeeklyReport";
@@ -32,6 +33,6 @@ function PMViewUnsignedReport(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMViewUnsignedReport;
diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index e1b1d66..317cec8 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -16,6 +16,6 @@ function UserEditTimeReportPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserEditTimeReportPage;
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index e54b207..2cdeb15 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -25,6 +25,6 @@ function UserNewTimeReportPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserNewTimeReportPage;
diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index 4760217..20fe6d7 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -27,6 +27,6 @@ function UserProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserProjectPage;
diff --git a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
index 1d2c3f4..ca326a0 100644
--- a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
+++ b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
@@ -15,6 +15,6 @@ function UserViewTimeReportsPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserViewTimeReportsPage;