Improved UI and the look and feel
Merge pull request #1 from hanzki/master

Improved UI and the look and feel