Re design (7/20)

Re design