Fixed UI issues