Added UI changes from CW