fixed UI integration issues.