Mockup refactoring and some small i18n bugfixes.
Merge pull request #720 from RotaruDan/mockupRefactoring

Mockup refactoring and some small i18n bugfixes.