UI changes for 5.7.
UI changes for 5.7.