Fix issues with menu bar