improve modal dialog button label
clarify utils
frontend refactor