More work on TopBar and authentication