Removed flickering on page load