Re design (14/20)

Re design