Replace table with sections
20 files changed