Adding buffer navigation