make ui neater (thanks @SteveBarnett)
Merge pull request #37 from universalcore/feature/issue-37-some-optimizations-in-the-UI

some optimizations in the UI