Merge pull request #1 from mfrederickson/master

UI and i18n tweaks.