Finished editing edit pages
Merge branch 'smallthings'