UI tweaking
Merge pull request #28 from peterfarsinsen/develop

UI tweaking