Changes made on Martin's server
Merged in buffer navigation