UI updates for 5.7