Fix the wrapping of the language selector

Fixed by simplifying the elements structure.

Also changed the label text, to make it clearer that that is
the language to which the translation is done.

Change-Id: Ieec69d9820f13235c99dcceecd7c4743273f44a2