remove advanced button, correct i18n text, refactor button display