Added more UI Click areas