some minor bugs fixed
Merge branch 'UI'