Redesign started

Much to re-add still