UI fix
Merge pull request #183 from zoic21/master

UI fix