Updates to clustering, perspectives, and toolbar