Refactored a bit and began work on controls menu