Final commit for twitter and website