fix some stuff and work on classes page