#48 Improve Language selection control