Added some cleaner functionality on the language selector