Continous redesign, intermediate step
Overview design mostly finished