Improve UX on page-load