Temporary fix of menu bar. Needs more work