Streamlining the Waterbear menus

I think the commit messages pretty much explain everything.