Merge branch 'hotfix/fix_letter_case_error'
optimize ui
Merge branch 'hotfix/optimize_ui' into develop