Merge pull request #56 from GorillaApp/pretty

Minor UI changes
Merge remote-tracking branch 'origin/master' into overlapping-features