removing accordion, adding toggable
refactoring form