Fix UI issue