modify for new ui
fix conflict