Feature #794

Merge in feature #794 page manager tree
Will be tweaked further with secondary requirements, when merged, needs master base work first.