Restructure
use placeholder selectors for buttons & splitbuttons
Re-order object list
Progress.