Created the basis for the main menu. Now I'm going to work on hooking it up
Some leftover changes that missed a commit