Estates UI Improvement