UI changes and fixes
Merge pull request #185 from PonteIneptique/UI-Improvments

UI changes and fixes
Merge remote-tracking branch 'upstream/master'