reorganize and fix typo in ui