UI improvements, small bug fixes.
Merge pull request #5 from zhelu/master

UI improvements, small bug fixes.