Small fixes
Add buffer navigation mappings