UI fixes
Merge pull request #295 from clovis/master

UI fixes