[security] Improved tree UX