Updated layout, went from 2:3 to 3:4. Updated sidebars for ContentPage and SiteImagePage.
Three hours on the theme.
resolve conflict?
Resolved conflict.