Theo's Changes to Gamelayout