Navigation updates and fixed the admin vs standard login