Re design (10/20)

Re design