Final merge 5/24 UI