Neaten up the menus. Close #82