Fixed UI inconsistency