UI7 changes, take 1.