merged ui into default