Implement basic options and move variable selection out of accordions