TMDM-7517: final translation and UI adjustment