fixing different UI issues
Merge pull request #7 from Thibou/fixing-UI

fixing different UI issues