Minor work on simplifying the menu and backend data store