Change buffer switch to space-space, remove conflicting map