Improve shift+move
Added buffer list