Continuing with website
Lots of fixes for website