Reorder Toolbar menu. Add existing languages to the toolbar menu
Minor code cleanup