Rearranged things a bit, and added the language select.