4.0: Performance improvements

Performance fixes for pages with many images. Thanks to @tractorcow and @kinglozzer for their efforts on this!