Updated skin, code cleanup
Merge pull request #34 from zasmarkany/ui-tweaks

Updated skin, code cleanup