More ui integration changes