changed expansions checkboxes to buttons; removed unused directives