Fixed ui.html conflicts