Finish message add layout and refactor test
Finish layout and routes