Fixed UI issue