Bug fixes and improvements on image/page loading