Clean up menu, fixes #17