Previous and Next Buttons buffer/stopper fix