Fleshed out the menu more