Added more UI controls