Restructure using a container view controller and fixed scroll view