a bit of tonight's progress: bit of UI changes
Merge pull request #58 from dipsticker/master

a bit of tonight's progress: bit of UI changes
Merged changes to incorperate Irving's changes