worked on navigation changes to consolidate when logged in