Tech Debt: Reverted to CtrlP for buffer switching