Re design (13/20)

Re design