moving static_pages to just pages, and slight improvements to edit form