First cut at keywording ui changes