Several fixes for UI with different languages