i18n, styling, delete link
Merge branch 'supervisor-tools' into tz-staging