Reworked the menu to make it simpler and more coherent