Fixes options and header toggles on tree