refactored new game form