Updated class selection form