Redesign

Dont merge today MERGE ON MONDAY