updated for logged in user and main menu