Add messages view
Merge branch 'feature/messages_view' into develop