Fleshed out menu
Code cleanup