Mockup refactoring and some small i18n bugfixes.