Re-order methods for smoother UX