Added 'WheelPosition' for laying out the wheel and various other changes