UI fix
Merge pull request #109 from zoic21/master

UI fix