Improvement of UI and translation