Reworked on adding edit pages