Changed Class Map buttons, next button bug fix.