Re design (11/20)

Re design