Merge pull request #488 from leider/master

Small UI stuff