Starting revamping of Website
Merge branch 'revamp'