fix ui bugs
Merge branch 'gh-pages'