initial work on collapse/expand
refactor expand/collapse; refactor icon styles;
more refactoring of expand/collapse