make some adjustment
Merge branch 'feature/fix_UI' into develop