Added buffer navigation