Fix ui entries