add Modal to classes page and some more fine-tuning