Improved handling of hero images