Added better buffer navigation