New UI code changes.