Implements page for messages
Fixes messages
Fixes messages template
Merge branch 'dev'