UI Fixed for class code.