Changed focus next mechanism + some internationalisation