UI improvements
Merge remote-tracking branch 'upstream/master'
Merge pull request #45 from SupunS/master

UI improvements