Fix Trash/Restore UI issues - Batch 1