Added more UI elements