fix toggle, handlers for each section