Fixed UI X and Y mess