MenuBarController added + various tweaks