Redesign almost ready

by Cerven Cotter