changed a fix six places in UI