Reorganized templates, panels used consistently

Reorganization and better consistency. Panels used, sometimes as
accordions if there's lots of content. Looks pretty good.