admin: improvements