Minor changes that fix some bugs and improvement the UI
Merge pull request #447 from RotaruDan/UI-improvements

UI improvements