new and edit pages
merge with upstream
Merge pull request #13 from thewatts/cleanup_admin_pages

Cleanup admin pages