Small UI fixes
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #32 from ssirushchyshyn/develop

UI modifications