Solved UI issue