Add messages, Rename rest controller, refactor UI