Cosmetic changes only
Move the lazy page rendering event handling into the generic section