Fix LoggedIn navigation. Remove old templates