Re design (15/20)

Re design