not important
mostly done with css/design
not important
Resolved merge conflicts
Front-end: message functionality works