Fix odd menu and sbar behaviour