UI issue Fix