Configure page feature complete.
Merge branch 'feature-configure-page'