new UI for main.xml
commit after resolving conflicts