Fix gamemodel and modal form