Redesign

Merging the latest re-design of the new website