Further updates the code for menus, and adds all options back to the
main menu
nothing chaaaaaanged