Design cleanup / Chat design improvements