Static pages: added Contact page, refactored spec