Fixing #58
Fixing some things for the administrator
Fixes #61