more ui integration work