Add Contact page and minor refactoring of static_pages_spec