Re-arranged admin utilities, added check for admin