fixed ui bug
Merge branch 'master' into kingman