Phase 2 changes

Several phase 2 commits. Needs testing. SEO plugin needs to be enabled.