Some changes to the menu, we're getting there now, not perfect, but good
enough