Merge branch 'hotfix/fix_make_up2'

* hotfix/fix_make_up2:
  fix make_up
remove *.swl files
fix ui
Merge branch 'hotfix/fix_ui' into develop

* hotfix/fix_ui:
  fix ui