UI / language fixes