Re-order methods for smoother UX
Merge pull request #4049 from Wikia/VE-1305

Re-order methods for smoother UX