QA Integration and Class UI update