Fixed UI overwrite