Finish keyword ui changes