fix lang issues and excursion toolbar