Tidy up
typo
Base layout view composer with multilanguage support
Merge branch 'master' into develop