enhance for click UI