misc: ui code cleanup part 1 out of 2
Merge pull request #106 from saukko28/master

misc: ui code cleanup part 1 out of 2