Message models changes

Introduce i18n
Make compact code view