Added easy buffer navigation mapping