UI fix
Merge pull request #158 from glenwks/master

UI fix