toolbar seems to be working now, as well.
menu items are making sense now, too.