Add single page support. Fix for flickering transition