cleaned up page load ordering