Add new UI
Fix conflict