Partial fix for multiple sections in view

Full fix is going to take some extra effort. Still not settled on a *perfect* solution