ui changes
Merge branch 'master' of https://github.com/relh/saladBar

had to pull