Few UI tweaks
Merge pull request #189 from davegw/refactor

Few UI tweaks