Fixed some issues with menu bar not displaying correctly