UI edits
Merge pull request #19 from apatel/master

UI edits