Modify UI
Fix conflict