small design changes
Messages reworked
Merge branch 'origin/dev'