Refactored riders and all movement on/off screen