Re design (18/20)

Re design