Add Contact page
Refactor Static Pages Spec