Removed toolbar text and changed translation handling