UI polished
Merge branch 'djy_jxy_dev' into dev
bugs fixed
conflict fixed