Minor cleanup of superuser toolbar

Something is still broken, though