Rebuilt the way page rendering was handled and added Override
Annotations.