Further fixes to SFN feed
Updated partner boxes to flow with content
Merge from GB