Re design (17/20)

Re design