Next/Prev fix cause of partial makeover