#3 Code cleanup
#3 Page referencess and regenerating on change