Re design (16/20)

Re design