Refactor of rendering pages complete