add everything for website
ready for 2.0 MVP deploy
fix merge conflict