change html and css of front page
merge and fix conflicts on peoples_controller