Update the logic

The logic for the language picker was missing with one last part
This should fix it and make it work much better.