Moved Pick and corrected formatting errors