Added settings icon and moved language button