navbar / signin cleanup