Turns out the 2-word app menu in the window's menu bar when there's no
shell to show the app menu looks like crap. Re-arrange the menus so that
we go back to having the old menu order in the window, independently of
the app menu. Only create the app menu when there's a shell to actually
show it, so that it doesn't show in the window's menubar instead.