Update design

WIP 

https://trello.com/card/-/50966697338f63e04a016041/261