Fix/improve language picker