fix some ui issue
Merge branch 'master' of github.com:allen2/jy