refactor toolbar to pass all fields and buttons into filters for modification/overriding