Congestion ui changes - DONT MERGE (2.3.0 changes)