Simplify panels, add 'subsection'