Redesign

Redesigned from top to bottom