diff --git a/ToDo.yaml b/ToDo.yaml
index 3f213f4..5b512f4 100755
--- a/ToDo.yaml
+++ b/ToDo.yaml
@@ -18,15 +18,10 @@ Server:
         Need to update notification email
 
 Client:
-    jobs/new:
+    jobs/editor:
         Job Listing Skills exists but isn't implimented in the UI
         Tab doesnt do anything
         Want to add completed job listing preview at end of carosel
-        Edit employees not implimented yet
-
-    Jobs/editor:
-        Jobs/editor w/ Querystring JobID=# is not implimented yet
-        Edit employees not implimented yet
 
     Resume:
         Resume builder minimal user input [ Dont allow AI input ]
@@ -38,9 +33,17 @@ Client:
         Allow users to look up jobs and apply [ Boost visibility | Completely manual ]
         Mark ghost listings to allow users to be informed and put companies on blast
 
-    CompanyConnect:
-        need to lookup company before making a new one
-        
+    company/editor:
+        Need to lookup company before making a new one
+        Tab key does nothing
+        Format phone number for database
+        Check DataType's for email and phone.
+        Setup QueryParam's for Edit and New
+        Edit employees not implimented yet
+
+    Company:
+        No employees for table yet
+
 
 database:
     Add Applied Jobs Table
\ No newline at end of file
diff --git a/src/Client/src/app/app.html b/src/Client/src/app/app.html
index 369369b..c02f3a9 100644
--- a/src/Client/src/app/app.html
+++ b/src/Client/src/app/app.html
@@ -1,8 +1,8 @@
 <div class="top-bar">
   <div class="top-bar-buttons">
-    <a #jobsLink class="nav-button" routerLink="/jobs">JOB BOARD</a>
-    <a #resumesLink class="nav-button" routerLink="/resumes">RESUMES</a>
-    <a #companiesLink class="nav-button" routerLink="/company">COMPANIES</a>
+    <a class="nav-button" routerLink="/jobs" routerLinkActive="active">JOB BOARD</a>
+    <a class="nav-button" routerLink="/resumes" routerLinkActive="active">RESUMES</a>
+    <a class="nav-button" routerLink="/company" routerLinkActive="active">COMPANIES</a>
   </div>
   <a class="top-bar-logo" routerLink="">
     <img class="top-bar-logo" style="margin: 0;" src="img/logo-full.png" />
diff --git a/src/Client/src/app/app.routes.ts b/src/Client/src/app/app.routes.ts
index 8331146..742e20a 100644
--- a/src/Client/src/app/app.routes.ts
+++ b/src/Client/src/app/app.routes.ts
@@ -6,9 +6,8 @@ import { PrivacyComponent } from './pages/legal/privacy/privacy.component';
 import { JobsComponent } from './pages/main/jobs/jobs.component';
 import { ResumesComponent } from './pages/main/resumes/resumes.component';
 import { JobEditorComponent } from './pages/main/jobs/editor/jobeditor.component';
-import { CompanyConnectComponent } from './pages/main/company/connect/companyconnect.component';
+import { CompanyEditorComponent } from './pages/main/company/editor/editor.component';
 import { JobViewerComponent } from './pages/main/jobs/viewer/jobviewer.component';
-import { CompanyJobsComponent } from './pages/main/company/jobs/jobs.component';
 import { CompanyComponent } from './pages/main/company/company.component';
 
 export const routes: Routes = [
@@ -26,11 +25,11 @@ export const routes: Routes = [
 
     // Company
     { path: "company", component: CompanyComponent },
-    { path: "company/connect", component: CompanyConnectComponent },
-    { path: "company/jobs", component: CompanyJobsComponent },
+    { path: "company/editor", component: CompanyEditorComponent },
 
     // Legal
     { path: "about", component: AboutComponent },
     { path: "contact", component: ContactComponent },
     { path: "privacy", component: PrivacyComponent }
+    
 ]
\ No newline at end of file