Classes page has been implemented.
Some re factoring.