Added more UI