Modify UI according to user feedback
Done
Merge pull request #18 from ryandang/issue30

Issue30