Minor shop style changes.
Merge add/edit pages in admin section.