Re-enable content grid with dropable sidebar
Backport id scheme from old theme