MVC Architecture Fixes & SetGame UML