Fixed a bunch of menu bugs. Fixes #197