Added shortcut for buffer switching and added tab shortcuts
Merged conflict