Added missing localization strings, some refactoring.