Heri | #1814: Feedback for the UI and translation