Change of plans from #26: Combined category templates, redesigned to two-column design