Settings popover refactor
Fix user nav hidden by settings popover