Added a lot of sorting to admin classes

Fixes #168