Small changes

Small remaining changes from ui