UI fix
Merge pull request #184 from zoic21/master

UI fix