added better UI