Fix ui behavior