Cleaned up menu module
Moved 'gameplay' stuff into game