further progress on ui integration