Cleanup, I18n, funny* eyes, checkmark and usability improvement

* proofreading / 4-eyes-principle