Implemented/improved image loading and handling