Website redesign

More changes to work with validator