Re design (19/20)

Re design