Clearing up UI issues