better naming conventions for paging
bit of a tidy up
pretty heavy refactor for factory mode
Explictly page -> mode, rename and refactor templates
Angular update, and big fac -> class push. Has some bugs still