UI issue fixed