Simplified map move logic