Refactor of rendering pages complete
prep for merge with upstream master