Added Edit Class/Grade. Tweaked various parts.