UI cleanup and preparation for l10n