Incorporate UI changes from Cullen Schaffer