(#14): Improve menus