add expander and styling; update templates to accommodate expander