Major admin functionality fixes