Finished up settings menu and a few minor updates