updates to toolbars, cleaning up sorters test/list headers spec