bug fixes on ui integration