adds Contact page + more refactoring