Making sure only UI changes are on this branch.