Fixed UI errors