fix bugs
Revert "fix bugs"

This reverts commit 45139b87a289f64bd293840b7c103477e24aad5d.
fix bugs of new ui