UI fix
Merge pull request #108 from zoic21/master

UI fix