Simplify layouts to 2 (content-sidebar and sidebar-content) to match _s