added contact page
refactored some more