made the move screen code more... 'efficient' (yes I know things could be more abstracted)