Merged & refined add + edit pages