Improve on window load behavior