Multiple UI fixes
Merge pull request #179 from anas-ambri/ui-fixes

Multiple UI fixes